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

Commit 324e36b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev

parents d80e331e 8bdbb580

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public interface SearchFeatureProvider { 
     * @throws IllegalArgumentException when caller is null

     * @throws SecurityException        when caller is not allowed to launch search result page

     */

    void verifyLaunchSearchResultPageCaller(Context context, @NonNull ComponentName caller)

    void verifyLaunchSearchResultPageCaller(@NonNull Context context, @NonNull String callerPackage)

            throws SecurityException, IllegalArgumentException;



    /**

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

+8 −10
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 


package com.android.settings.search;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.annotation.NonNull;



import com.android.settingslib.search.SearchIndexableResources;

import com.android.settingslib.search.SearchIndexableResourcesMobile;
@@ -32,21 +33,18 @@ import com.android.settingslib.search.SearchIndexableResourcesMobile; 
 */

public class SearchFeatureProviderImpl implements SearchFeatureProvider {



    private static final String TAG = "SearchFeatureProvider";



    private SearchIndexableResources mSearchIndexableResources;



    @Override

    public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {

        if (caller == null) {

    public void verifyLaunchSearchResultPageCaller(@NonNull Context context,

            @NonNull String callerPackage) {

        if (TextUtils.isEmpty(callerPackage)) {

            throw new IllegalArgumentException("ExternalSettingsTrampoline intents "

                    + "must be called with startActivityForResult");

        }

        final String packageName = caller.getPackageName();

        final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())

                || TextUtils.equals(getSettingsIntelligencePkgName(context), packageName);

        final boolean isAllowlistedPackage =

                isSignatureAllowlisted(context, caller.getPackageName());

        final boolean isSettingsPackage = TextUtils.equals(callerPackage, context.getPackageName())

                || TextUtils.equals(getSettingsIntelligencePkgName(context), callerPackage);

        final boolean isAllowlistedPackage = isSignatureAllowlisted(context, callerPackage);

        if (isSettingsPackage || isAllowlistedPackage) {

            return;

        }

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

+6 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENT 
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Intent;

import android.os.Bundle;

import android.provider.Settings;
@@ -48,11 +47,11 @@ public class SearchResultTrampoline extends Activity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        final ComponentName callingActivity = getCallingActivity();

        final String callerPackage = getLaunchedFromPackage();

        // First make sure caller has privilege to launch a search result page.

        FeatureFactory.getFactory(this)

                .getSearchFeatureProvider()

                .verifyLaunchSearchResultPageCaller(this, callingActivity);

                .verifyLaunchSearchResultPageCaller(this, callerPackage);

        // Didn't crash, proceed and launch the result as a subsetting.

        Intent intent = getIntent();

        final String highlightMenuKey = intent.getStringExtra(
@@ -96,7 +95,7 @@ public class SearchResultTrampoline extends Activity { 


        if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) {

            startActivity(intent);

        } else if (isSettingsIntelligence(callingActivity)) {

        } else if (isSettingsIntelligence(callerPackage)) {

            // Register SplitPairRule for SubSettings, set clearTop false to prevent unexpected back

            // navigation behavior.

            ActivityEmbeddingRulesController.registerSubSettingsPairRule(this,
@@ -122,9 +121,9 @@ public class SearchResultTrampoline extends Activity { 
        finish();

    }



    private boolean isSettingsIntelligence(ComponentName callingActivity) {

        return callingActivity != null && TextUtils.equals(

                callingActivity.getPackageName(),

    private boolean isSettingsIntelligence(String callerPackage) {

        return TextUtils.equals(

                callerPackage,

                FeatureFactory.getFactory(this).getSearchFeatureProvider()

                        .getSettingsIntelligencePkgName(this));

    }

tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java

+8 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package com.android.settings.search; 
import static com.google.common.truth.Truth.assertThat;



import android.app.settings.SettingsEnums;

import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ResolveInfo;
@@ -127,20 +126,22 @@ public class SearchFeatureProviderImplTest { 


    @Test(expected = SecurityException.class)

    public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {

        final ComponentName cn = new ComponentName("pkg", "class");

        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);

        final String packageName = "pkg";



        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);

    }



    @Test

    public void verifyLaunchSearchResultPageCaller_settingsCaller_shouldNotCrash() {

        final ComponentName cn = new ComponentName(mActivity.getPackageName(), "class");

        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);

        final String packageName = mActivity.getPackageName();



        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);

    }



    @Test

    public void verifyLaunchSearchResultPageCaller_settingsIntelligenceCaller_shouldNotCrash() {

        final String packageName = mProvider.getSettingsIntelligencePkgName(mActivity);

        final ComponentName cn = new ComponentName(packageName, "class");

        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);



        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);

    }

}