PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash on AppInfo screen"

Browse Source
This commit is contained in:
Fan Zhang
2019-03-18 18:36:49 +00:00
committed by Android (Google) Code Review
parent 711b78d5ed 062d4acf45
commit 9f5e7b77ff
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/search/SearchFeatureProvider.java
View File

@@ -39,7 +39,7 @@ import com.android.settingslib.search.SearchIndexableResources;
*/ */
public interface SearchFeatureProvider { public interface SearchFeatureProvider {
int REQUEST_CODE = 0; int REQUEST_CODE = 501;
/** /**
* Ensures the caller has necessary privilege to launch search result page. * Ensures the caller has necessary privilege to launch search result page.

3
src/com/android/settings/search/actionbar/SearchMenuController.java
View File

@@ -33,6 +33,7 @@ import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.overlay.FeatureFactory; 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.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
@@ -93,7 +94,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
FeatureFactory.getFactory(context).getMetricsFeatureProvider() FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, SettingsEnums.ACTION_SEARCH_RESULTS); .action(context, SettingsEnums.ACTION_SEARCH_RESULTS);
mHost.startActivityForResult(intent, 0 /* requestCode */); mHost.startActivityForResult(intent, SearchFeatureProvider.REQUEST_CODE);
return true; return true;
}); });
} }