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

Unverified Commit 15dafa0f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r35' into staging/lineage-21.0_merge-android-14.0.0_r35 

Android 14.0.0 release 35

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZjprgQAKCRDorT+BmrEO
# eMOfAJ9dON+T8xI/9a+U6Ifh4+djrro8dQCfUogitVSgLns66phrxgbpKT+EyP8=
# =Go8s
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue May  7 20:57:21 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2426 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Jason Chiu
# Via Android Build Coastguard Worker
* tag 'android-14.0.0_r35':
  Replace getCallingActivity() with getLaunchedFromPackage()

Change-Id: I19d00b5bc46d8a1ef9209db77c996ed4d2759f36
parents d3002c16 4ba2bb4e

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
@@ -21,7 +21,6 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB; 
import static com.android.settings.activityembedding.EmbeddedDeepLinkUtils.getTrampolineIntent;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;
@@ -53,11 +52,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.getFeatureFactory()

                .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(
@@ -106,7 +105,7 @@ public class SearchResultTrampoline extends Activity { 
        if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)

                || ActivityEmbeddingUtils.isAlreadyEmbedded(this)) {

            startActivity(intent);

        } else if (isSettingsIntelligence(callingActivity)) {

        } else if (isSettingsIntelligence(callerPackage)) {

            if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SETTINGS_SEARCH_ALWAYS_EXPAND)) {

                startActivity(getTrampolineIntent(intent, highlightMenuKey)

                        .setClass(this, DeepLinkHomepageActivityInternal.class)
@@ -139,9 +138,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.getFeatureFactory().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;
@@ -131,20 +130,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);

    }

}