Fix SearchProvider

The SearchProvider was attempting to launch ANGLE's MainActivity class with the wrong fully qualified class name when Google's version (com.google.android.angle) was installed on the device: com.google.android.angle/.MainActivity Instead, the AndroidManifest.xml and SearchProvider need to use the fully qualified class name for com.android.angle.MainActivity since the package name will differ between the AOSP (com.android.angle) and Google (com.google.android.angle) versions. Bug: b:142320172 Change-Id: Iab6883736be2a21dff64993bcaedbcc4c0cfecf8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2099443Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Fix SearchProvider
27f310da · Tim Van Patten · Commit Bot · 14aaa1eb · 27f310da · 27f310da
Commit 27f310da authored Mar 11, 2020 by Tim Van Patten Committed by Commit Bot Mar 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

AndroidManifest.xml ...system_settings/src/com/android/angle/AndroidManifest.xml +1 -1

SearchProvider.java ...settings/src/com/android/angle/common/SearchProvider.java +1 -2

No files found.
--- a/src/android_system_settings/src/com/android/angle/AndroidManifest.xml
+++ b/src/android_system_settings/src/com/android/angle/AndroidManifest.xml
@@ -34,7 +34,7 @@
                 android:forceQueryable="true"
                 android:multiArch="true">
-        <activity android:name=".MainActivity"
+        <activity android:name="com.android.angle.MainActivity"
                  android:label="@string/angle_preferences"
                  android:description="@string/angle_preferences_summary"
                  android:theme="@style/Theme.Settings"

--- a/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
+++ b/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
@@ -63,8 +63,7 @@ public class SearchProvider extends SearchIndexablesProvider
        ref[COLUMN_INDEX_RAW_KEYWORDS]      = context.getString(R.string.keywords);
        ref[COLUMN_INDEX_RAW_INTENT_ACTION] = Intent.ACTION_MAIN;
        ref[COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE] = getContext().getApplicationInfo().packageName;
-        ref[COLUMN_INDEX_RAW_INTENT_TARGET_CLASS] =
+        ref[COLUMN_INDEX_RAW_INTENT_TARGET_CLASS]   = "com.android.angle.MainActivity";
-                getContext().getApplicationInfo().packageName + ".MainActivity";
        cursor.addRow(ref);
        return cursor;