Snap for 8564071 from 3833eedd4cc878745e4686d760804c3fcc895f2b to mainline-os-statsd-release
Change-Id: I0bb6f0acfd807714b709de717c83b81e06b3b3f9
diff --git a/Android.bp b/Android.bp
index c06dc3a..6f26bf0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,9 +14,14 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_app {
name: "QuickSearchBox",
- sdk_version: "14",
+ sdk_version: "current",
static_libs: [
"guava",
"android-common",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de561cb..7120537 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
<original-package android:name="com.android.quicksearchbox" />
- <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.GLOBAL_SEARCH" />
@@ -39,11 +39,11 @@
android:name=".QsbApplicationWrapper"
android:theme="@style/Theme.QuickSearchBox"
android:hardwareAccelerated="true">
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
<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>
@@ -63,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" />
@@ -74,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/BUILD b/BUILD
new file mode 100644
index 0000000..76b0c0c
--- /dev/null
+++ b/BUILD
@@ -0,0 +1,24 @@
+load("@rules_android//rules:rules.bzl", "android_binary")
+load("//build/make/tools:event_log_tags.bzl", "event_log_tags")
+
+event_log_tags(
+ name = "genlogtags",
+ srcs = glob(["src/**/*.logtags"]),
+)
+
+android_binary(
+ name = "QuickSearchBox",
+ srcs = glob(["src/**/*.java"]) + [
+ ":genlogtags",
+ ],
+ custom_package = "com.android.quicksearchbox",
+ javacopts = ["-Xep:ArrayToString:OFF"],
+ manifest = "AndroidManifest.xml",
+ # TODO(182591919): uncomment the below once android rules are integrated with r8.
+ # proguard_specs = ["proguard.flags"],
+ resource_files = glob(["res/**"]),
+ deps = [
+ "//external/guava",
+ "//frameworks/ex/common:android-common",
+ ],
+)
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index c5b1efa..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,190 +0,0 @@
-
- Copyright (c) 2005-2008, The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
index 3540a97..7519181 100644
--- a/benchmarks/Android.bp
+++ b/benchmarks/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "QuickSearchBoxBenchmarks",
sdk_version: "current",
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/proguard.flags b/proguard.flags
index 8390f5b..922c2ba 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,11 @@
-keep class com.android.quicksearchbox.preferences.DeviceSearchFragment
-keep class com.android.quicksearchbox.preferences.SearchableItemsFragment
+
+-keep class com.android.quicksearchbox.util.CachedLater {
+ *;
+}
+
+-keep class com.android.quicksearchbox.util.PerNameExecutor {
+ *;
+}
diff --git a/res/drawable/btn_search_dialog_voice.xml b/res/drawable/btn_search_dialog_voice.xml
index 748aaf5..05abf61 100644
--- a/res/drawable/btn_search_dialog_voice.xml
+++ b/res/drawable/btn_search_dialog_voice.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_window_focused="false" android:state_enabled="true"
+ <item android:state_window_focused="false" android:state_enabled="true"
android:drawable="@drawable/btn_search_dialog_voice_default" />
<item android:state_pressed="true"
diff --git a/res/values/config.xml b/res/values/config.xml
index 4e11cf2..98724e2 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -110,6 +110,6 @@
<!-- should be mirrored by changes in GoogleSuggestClient -->
<!-- Do not translate. This string is an internal URI, not seen in the UI. -->
<string name="google_suggest_base" translatable="false">
- http://www.google.com/complete/search?hl=%1$s&client=android&q=</string>
+ https://www.google.com/complete/search?hl=%1$s&client=android&q=</string>
</resources>
diff --git a/src/com/android/quicksearchbox/SearchWidgetProvider.java b/src/com/android/quicksearchbox/SearchWidgetProvider.java
index 205e7cc..fdd8cf3 100644
--- a/src/com/android/quicksearchbox/SearchWidgetProvider.java
+++ b/src/com/android/quicksearchbox/SearchWidgetProvider.java
@@ -178,6 +178,7 @@
private void setOnClickActivityIntent(Context context, RemoteViews views, int viewId,
Intent intent) {
+ intent.setPackage(context.getPackageName());
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
views.setOnClickPendingIntent(viewId, pendingIntent);
}
diff --git a/src/com/android/quicksearchbox/google/GoogleSuggestClient.java b/src/com/android/quicksearchbox/google/GoogleSuggestClient.java
index 5381acb..51c5129 100644
--- a/src/com/android/quicksearchbox/google/GoogleSuggestClient.java
+++ b/src/com/android/quicksearchbox/google/GoogleSuggestClient.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-import android.net.http.AndroidHttpClient;
import android.os.Build;
import android.os.Handler;
import android.text.TextUtils;
@@ -33,16 +32,17 @@
import com.android.quicksearchbox.SuggestionCursor;
import com.android.quicksearchbox.util.NamedTaskExecutor;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.EntityUtils;
import org.json.JSONArray;
import org.json.JSONException;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
import java.net.URLEncoder;
import java.util.Locale;
@@ -60,15 +60,13 @@
// TODO: this should be defined somewhere
private static final String HTTP_TIMEOUT = "http.conn-manager.timeout";
- private final HttpClient mHttpClient;
+ private final int mConnectTimeout;
public GoogleSuggestClient(Context context, Handler uiThread,
NamedTaskExecutor iconLoader, Config config) {
super(context, uiThread, iconLoader);
- mHttpClient = AndroidHttpClient.newInstance(USER_AGENT, context);
- HttpParams params = mHttpClient.getParams();
- params.setLongParameter(HTTP_TIMEOUT, config.getHttpConnectTimeout());
+ mConnectTimeout = config.getHttpConnectTimeout();
// NOTE: Do not look up the resource here; Localization changes may not have completed
// yet (e.g. we may still be reading the SIM card).
mSuggestUri = null;
@@ -101,33 +99,48 @@
Log.i(LOG_TAG, "Not connected to network.");
return null;
}
+ HttpURLConnection connection = null;
try {
String encodedQuery = URLEncoder.encode(query, "UTF-8");
if (mSuggestUri == null) {
Locale l = Locale.getDefault();
String language = GoogleSearch.getLanguage(l);
mSuggestUri = getContext().getResources().getString(R.string.google_suggest_base,
- language);
+ language);
}
String suggestUri = mSuggestUri + encodedQuery;
if (DBG) Log.d(LOG_TAG, "Sending request: " + suggestUri);
- HttpGet method = new HttpGet(suggestUri);
- HttpResponse response = mHttpClient.execute(method);
- if (response.getStatusLine().getStatusCode() == 200) {
+ URL url = URI.create(suggestUri).toURL();
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setConnectTimeout(mConnectTimeout);
+ connection.setRequestProperty("User-Agent", USER_AGENT);
+ connection.setRequestMethod("GET");
+ connection.setDoInput(true);
+ connection.connect();
+ InputStream inputStream = connection.getInputStream();
+ if (connection.getResponseCode() == 200) {
/* Goto http://www.google.com/complete/search?json=true&q=foo
* to see what the data format looks like. It's basically a json
* array containing 4 other arrays. We only care about the middle
* 2 which contain the suggestions and their popularity.
*/
- JSONArray results = new JSONArray(EntityUtils.toString(response.getEntity()));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ sb.append(line).append("\n");
+ }
+ reader.close();
+ JSONArray results = new JSONArray(sb.toString());
JSONArray suggestions = results.getJSONArray(1);
JSONArray popularity = results.getJSONArray(2);
if (DBG) Log.d(LOG_TAG, "Got " + suggestions.length() + " results");
return new GoogleSuggestCursor(this, query, suggestions, popularity);
} else {
- if (DBG) Log.d(LOG_TAG, "Request failed " + response.getStatusLine());
+ if (DBG)
+ Log.d(LOG_TAG, "Request failed " + connection.getResponseMessage());
}
} catch (UnsupportedEncodingException e) {
Log.w(LOG_TAG, "Error", e);
@@ -135,6 +148,8 @@
Log.w(LOG_TAG, "Error", e);
} catch (JSONException e) {
Log.w(LOG_TAG, "Error", e);
+ } finally {
+ if (connection != null) connection.disconnect();
}
return null;
}
diff --git a/tests/Android.bp b/tests/Android.bp
index e11929c..8ca5cf9 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "QuickSearchBoxTests",
sdk_version: "9",
diff --git a/tests/naughty/Android.bp b/tests/naughty/Android.bp
index 72d8e53..0b735c0 100644
--- a/tests/naughty/Android.bp
+++ b/tests/naughty/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "NaughtySuggestions",
sdk_version: "current",
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/Android.bp b/tests/partial/Android.bp
index 73f9772..7a5797b 100644
--- a/tests/partial/Android.bp
+++ b/tests/partial/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "PartialSuggestions",
sdk_version: "8",
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/Android.bp b/tests/slow/Android.bp
index 40fc70e..ac8640d 100644
--- a/tests/slow/Android.bp
+++ b/tests/slow/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "SlowSuggestions",
sdk_version: "8",
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/Android.bp b/tests/spammy/Android.bp
index 7e5f201..16a338a 100644
--- a/tests/spammy/Android.bp
+++ b/tests/spammy/Android.bp
@@ -14,6 +14,11 @@
// limitations under the License.
//
+package {
+ // http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_test {
name: "SpammySuggestions",
sdk_version: "8",
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>
diff --git a/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java b/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
index 537e3ed..1bb1035 100644
--- a/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
+++ b/tests/src/com/android/quicksearchbox/LevenshteinFormatterTest.java
@@ -87,7 +87,7 @@
}
public void testTokenizeWithTabs() {
- verifyTokenizeResult("paranoid\tandroid\t", "paranoid", "android");
+ verifyTokenizeResult("don't\tpanic\t", "don't", "panic");
}
private void verifyFindMatches(String source, String target, String... newTokensInTarget) {
