Merge "Log when enforceActor fails" into sc-dev (75073250) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/om/OverlayActorEnforcer.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.net.Uri;
		import android.os.Process;
		import android.text.TextUtils;
		import android.util.Pair;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		@@ -42,9 +43,6 @@ import java.util.Map;
		*/
		public class OverlayActorEnforcer {

		// By default, the reason is not logged to prevent leaks of why it failed
		private static final boolean DEBUG_REASON = false;

		private final PackageManagerHelper mPackageManager;

		/**
		@@ -85,17 +83,18 @@ public class OverlayActorEnforcer {

		void enforceActor(@NonNull OverlayInfo overlayInfo, @NonNull String methodName,
		int callingUid, int userId) throws SecurityException {
		ActorState actorState = isAllowedActor(methodName, overlayInfo, callingUid, userId);
		final ActorState actorState = isAllowedActor(methodName, overlayInfo, callingUid, userId);
		if (actorState == ActorState.ALLOWED) {
		return;
		}

		String targetOverlayableName = overlayInfo.targetOverlayableName;
		throw new SecurityException("UID" + callingUid + " is not allowed to call "
		+ methodName + " for "
		final String targetOverlayableName = overlayInfo.targetOverlayableName;
		final String errorMessage = "UID" + callingUid + " is not allowed to call " + methodName
		+ " for "
		+ (TextUtils.isEmpty(targetOverlayableName) ? "" : (targetOverlayableName + " in "))
		+ overlayInfo.targetPackageName + (DEBUG_REASON ? (" because " + actorState) : "")
		);
		+ overlayInfo.targetPackageName + " for user " + userId;
		Slog.w(OverlayManagerService.TAG, errorMessage + " because " + actorState);
		throw new SecurityException(errorMessage);
		}

		/**