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

Commit e66ac85d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Properly check for SDK before nullifying attribution tag" into sc-dev... 

Merge "Properly check for SDK before nullifying attribution tag" into sc-dev am: b3c8d6d2 am: 10714fa2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940427

Change-Id: Ie0416ae8e6fdec23d5b878689f2c2102d5b22484
parents 455f7c8f 10714fa2

core/java/android/speech/RecognitionService.java

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ public abstract class RecognitionService extends Service { 
    protected abstract void onStopListening(Callback listener);



    @Override

    @SuppressLint("MissingNullability")

    public Context createContext(@NonNull ContextParams contextParams) {

        if (contextParams.getNextAttributionSource() != null) {

            if (mHandler.getLooper().equals(Looper.myLooper())) {

services/core/java/com/android/server/appop/AppOpsService.java

+6 −6
Original line number Diff line number Diff line
@@ -4558,15 +4558,15 @@ public class AppOpsService extends IAppOpsService.Stub { 
                }



                try {

                    if (mPlatformCompat.isChangeEnabledByPackageName(

                    if (!mPlatformCompat.isChangeEnabledByPackageName(

                            SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE, packageName,

                            userId) && mPlatformCompat.isChangeEnabledByUid(

                            userId) || !mPlatformCompat.isChangeEnabledByUid(

                                    SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE,

                            callingUid) && !isAttributionTagValid) {

                        Slog.e(TAG, msg);

                    } else {

                        Slog.e(TAG, msg);

                            callingUid)) {

                        // Do not override tags if overriding is not enabled for this package

                        isAttributionTagValid = true;

                    }

                    Slog.e(TAG, msg);

                } catch (RemoteException neverHappens) {

                }

            }