diff options
| author | tmfang <tmfang@google.com> | 2019-03-09 13:53:02 +0800 |
|---|---|---|
| committer | tmfang <tmfang@google.com> | 2019-03-18 14:09:52 +0800 |
| commit | 062d4acf457129e3c00cf65fa17a6281f2c471b4 (patch) | |
| tree | 3079341923fc8c1a525629cff8092a68bf8fe872 /src/com/android/settings/search | |
| parent | 313bddb80e79e8e00d1bca56e7e379b564567723 (diff) | |
| download | packages_apps_Settings-062d4acf457129e3c00cf65fa17a6281f2c471b4.tar.gz packages_apps_Settings-062d4acf457129e3c00cf65fa17a6281f2c471b4.tar.bz2 packages_apps_Settings-062d4acf457129e3c00cf65fa17a6281f2c471b4.zip | |
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
Diffstat (limited to 'src/com/android/settings/search')
| -rw-r--r-- | src/com/android/settings/search/SearchFeatureProvider.java | 2 | ||||
| -rw-r--r-- | src/com/android/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 dcb4acc5d9..896f6e5c78 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 af7141e54f..25d0d3027d 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; }); } |