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

Commit 6127bdec authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Remove exception for Q- apps from app op validation am:... 

RESTRICT AUTOMERGE Remove exception for Q- apps from app op validation am: b8059736 am: 197bc9a3

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



Change-Id: Id656891cf13745e4982fd6bc0cacb0af65feac6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed27e796 197bc9a3

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

+1 −14
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import static android.app.AppOpsManager.SAMPLING_STRATEGY_BOOT_TIME_SAMPLING; 
import static android.app.AppOpsManager.SAMPLING_STRATEGY_RARELY_USED;

import static android.app.AppOpsManager.SAMPLING_STRATEGY_UNIFORM;

import static android.app.AppOpsManager.SAMPLING_STRATEGY_UNIFORM_OPS;

import static android.app.AppOpsManager.SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE;

import static android.app.AppOpsManager.UID_STATE_BACKGROUND;

import static android.app.AppOpsManager.UID_STATE_CACHED;

import static android.app.AppOpsManager.UID_STATE_FOREGROUND;
@@ -4758,19 +4757,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    msg = "package " + packageName + " not found, can't check for "

                            + "attributionTag " + attributionTag;

                }



                try {

                    if (!mPlatformCompat.isChangeEnabledByPackageName(

                            SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE, packageName,

                            userId) || !mPlatformCompat.isChangeEnabledByUid(

                                    SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE,

                            callingUid)) {

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

                        isAttributionTagValid = true;

                    }

                Slog.e(TAG, msg);

                } catch (RemoteException neverHappens) {

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);