Merge "Don't check for changeid permissions in system server" am: 79ce5ef0b2... (f9b1e6a1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/compat/PlatformCompat.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.Manifest.permission.LOG_COMPAT_CHANGE;
		import static android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG;
		import static android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.Process.SYSTEM_UID;

		import android.annotation.UserIdInt;
		import android.app.ActivityManager;
		@@ -326,6 +327,10 @@ public class PlatformCompat extends IPlatformCompat.Stub {
		}

		private void checkCompatChangeLogPermission() throws SecurityException {
		// Don't check for permissions within the system process
		if (Binder.getCallingUid() == SYSTEM_UID) {
		return;
		}
		if (mContext.checkCallingOrSelfPermission(LOG_COMPAT_CHANGE)
		!= PERMISSION_GRANTED) {
		throw new SecurityException("Cannot log compat change usage");
		@@ -333,6 +338,10 @@ public class PlatformCompat extends IPlatformCompat.Stub {
		}

		private void checkCompatChangeReadPermission() throws SecurityException {
		// Don't check for permissions within the system process
		if (Binder.getCallingUid() == SYSTEM_UID) {
		return;
		}
		if (mContext.checkCallingOrSelfPermission(READ_COMPAT_CHANGE_CONFIG)
		!= PERMISSION_GRANTED) {
		throw new SecurityException("Cannot read compat change");
		@@ -340,6 +349,10 @@ public class PlatformCompat extends IPlatformCompat.Stub {
		}

		private void checkCompatChangeOverridePermission() throws SecurityException {
		// Don't check for permissions within the system process
		if (Binder.getCallingUid() == SYSTEM_UID) {
		return;
		}
		if (mContext.checkCallingOrSelfPermission(OVERRIDE_COMPAT_CHANGE_CONFIG)
		!= PERMISSION_GRANTED) {
		throw new SecurityException("Cannot override compat change");