Merge "RESTRICT AUTOMERGE Remove exception for Q- apps from app op validation" into udc-dev (10b710ab) · Commits · e / os / android_frameworks_base

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

+1 −14

Original line number	Diff line number	Diff line
		@@ -53,7 +53,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._NUM_OP;
		import static android.app.AppOpsManager.extractFlagsFromKey;
		import static android.app.AppOpsManager.extractUidStateFromKey;
		@@ -3937,19 +3936,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);