From 062d4acf457129e3c00cf65fa17a6281f2c471b4 Mon Sep 17 00:00:00 2001 From: tmfang Date: Sat, 9 Mar 2019 13:53:02 +0800 Subject: [PATCH] Fix crash on AppInfo screen We start a search page with a request code which is same as "uninstall" request code. The root cause is we handle same reuqest code for different event. We redefine an unique request code for "search" feature. Fixes: 124775813 Test: Click search and back to App info screen. Change-Id: I8ab21c30b605bcb65b6d4bd9fceb749a65a49f80 --- src/com/android/settings/search/SearchFeatureProvider.java | 2 +- .../settings/search/actionbar/SearchMenuController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index dcb4acc5d92..896f6e5c78c 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -39,7 +39,7 @@ import com.android.settingslib.search.SearchIndexableResources; */ public interface SearchFeatureProvider { - int REQUEST_CODE = 0; + int REQUEST_CODE = 501; /** * Ensures the caller has necessary privilege to launch search result page. diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index af7141e54f1..25d0d3027d5 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -33,6 +33,7 @@ import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.search.SearchFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; @@ -93,7 +94,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM FeatureFactory.getFactory(context).getMetricsFeatureProvider() .action(context, SettingsEnums.ACTION_SEARCH_RESULTS); - mHost.startActivityForResult(intent, 0 /* requestCode */); + mHost.startActivityForResult(intent, SearchFeatureProvider.REQUEST_CODE); return true; }); }