Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f5e7b77 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on AppInfo screen"

parents 711b78d5 062d4acf

src/com/android/settings/search/SearchFeatureProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -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.

src/com/android/settings/search/actionbar/SearchMenuController.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

        });

    }