summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-06 22:53:57 +0000
committerXin Li <delphij@google.com>2021-10-06 22:53:57 +0000
commit5d6550204dbf9ad6f54c04e0b6d0d998747c3464 (patch)
treef8bee6ca52e6a4f9bde295222d755313f157bf01
parent26cae235afa87153afc120e9c66198e5f591a4c7 (diff)
parent3ccbcd7fe502398739e4d13b5e2f4603782441e9 (diff)
downloadQuickSearchBox-5d6550204dbf9ad6f54c04e0b6d0d998747c3464.tar.gz
Merge Android 12
Bug: 202323961 Merged-In: If0edbee7302760c9d84d1ddafd1b5c82114af237 Change-Id: Icb33622b7f97e5fcec6a90eb37201ec4d38d086c
-rw-r--r--AndroidManifest.xml3
-rw-r--r--benchmarks/AndroidManifest.xml4
-rw-r--r--tests/naughty/AndroidManifest.xml2
-rw-r--r--tests/partial/AndroidManifest.xml1
-rw-r--r--tests/slow/AndroidManifest.xml1
-rw-r--r--tests/spammy/AndroidManifest.xml1
6 files changed, 12 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0c05e2a..7120537 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,6 +43,7 @@
<activity android:name=".SearchActivity"
android:label="@string/app_name"
android:launchMode="singleTask"
+ android:exported="true"
android:theme="@style/Theme.QuickSearchBox.Search">
<!-- Show app icon in Launcher. -->
<intent-filter>
@@ -62,6 +63,7 @@
</activity>
<receiver android:name=".SearchWidgetProvider"
+ android:exported="true"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -73,6 +75,7 @@
android:label="@string/google_search_label"
android:icon="@mipmap/google_icon"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.WEB_SEARCH" />
diff --git a/benchmarks/AndroidManifest.xml b/benchmarks/AndroidManifest.xml
index ce6e65e..d2176c0 100644
--- a/benchmarks/AndroidManifest.xml
+++ b/benchmarks/AndroidManifest.xml
@@ -22,6 +22,7 @@
<application>
<activity android:name=".ApplicationsLatency"
android:stateNotNeeded="true"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -31,6 +32,7 @@
<activity android:name=".ContactsLatency"
android:stateNotNeeded="true"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -40,6 +42,7 @@
<activity android:name=".WebConcurrency"
android:stateNotNeeded="true"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -49,6 +52,7 @@
<activity android:name=".WebLatency"
android:stateNotNeeded="true"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/tests/naughty/AndroidManifest.xml b/tests/naughty/AndroidManifest.xml
index f2179f0..6c710d2 100644
--- a/tests/naughty/AndroidManifest.xml
+++ b/tests/naughty/AndroidManifest.xml
@@ -23,6 +23,7 @@
android:icon="@drawable/hang"
android:stateNotNeeded="true"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
@@ -40,6 +41,7 @@
android:icon="@drawable/crash"
android:stateNotNeeded="true"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
diff --git a/tests/partial/AndroidManifest.xml b/tests/partial/AndroidManifest.xml
index 647c28f..abe3ca7 100644
--- a/tests/partial/AndroidManifest.xml
+++ b/tests/partial/AndroidManifest.xml
@@ -21,6 +21,7 @@
<activity android:name=".PartialSuggestionLauncher"
android:label="@string/app_label"
android:stateNotNeeded="true"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
diff --git a/tests/slow/AndroidManifest.xml b/tests/slow/AndroidManifest.xml
index 4e05b80..f60a076 100644
--- a/tests/slow/AndroidManifest.xml
+++ b/tests/slow/AndroidManifest.xml
@@ -22,6 +22,7 @@
android:label="@string/app_label"
android:stateNotNeeded="true"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
diff --git a/tests/spammy/AndroidManifest.xml b/tests/spammy/AndroidManifest.xml
index 812b234..c9a9954 100644
--- a/tests/spammy/AndroidManifest.xml
+++ b/tests/spammy/AndroidManifest.xml
@@ -22,6 +22,7 @@
android:label="@string/app_label"
android:stateNotNeeded="true"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>