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

Commit 0075be3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't check for changeid permissions in system server" am: 79ce5ef0 

Change-Id: Ib368fa63a4c9d4db2921d2cf87a3a12ae8f6e98f
parents 9cdea35a 79ce5ef0

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

+13 −0
Original line number Original line 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.OVERRIDE_COMPAT_CHANGE_CONFIG;

import static android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG;

import static android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.Process.SYSTEM_UID;





import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.ActivityManager;
@@ -329,6 +330,10 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    }

    }





    private void checkCompatChangeLogPermission() throws SecurityException {

    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)

        if (mContext.checkCallingOrSelfPermission(LOG_COMPAT_CHANGE)

                != PERMISSION_GRANTED) {

                != PERMISSION_GRANTED) {

            throw new SecurityException("Cannot log compat change usage");

            throw new SecurityException("Cannot log compat change usage");
@@ -336,6 +341,10 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    }

    }





    private void checkCompatChangeReadPermission() throws SecurityException {

    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)

        if (mContext.checkCallingOrSelfPermission(READ_COMPAT_CHANGE_CONFIG)

                != PERMISSION_GRANTED) {

                != PERMISSION_GRANTED) {

            throw new SecurityException("Cannot read compat change");

            throw new SecurityException("Cannot read compat change");
@@ -343,6 +352,10 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    }

    }





    private void checkCompatChangeOverridePermission() throws SecurityException {

    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)

        if (mContext.checkCallingOrSelfPermission(OVERRIDE_COMPAT_CHANGE_CONFIG)

                != PERMISSION_GRANTED) {

                != PERMISSION_GRANTED) {

            throw new SecurityException("Cannot override compat change");

            throw new SecurityException("Cannot override compat change");