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

Commit 3eba959f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add work profile support for registering phone accounts ...""

parents 90040267 345d2bfc

src/com/android/server/telecom/TelecomServiceImpl.java

+1 −9
Original line number Diff line number Diff line
@@ -2525,9 +2525,7 @@ public class TelecomServiceImpl { 


    private void enforceUserHandleMatchesCaller(PhoneAccountHandle accountHandle) {

        if (!Binder.getCallingUserHandle().equals(accountHandle.getUserHandle())) {

            // Enforce INTERACT_ACROSS_USERS if the calling user handle does not match

            // phoen account's user handle

            enforceInAppCrossUserPermission();

            throw new SecurityException("Calling UserHandle does not match PhoneAccountHandle's");

        }

    }
@@ -2546,12 +2544,6 @@ public class TelecomServiceImpl { 
        }

    }



    private void enforceInAppCrossUserPermission() {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.INTERACT_ACROSS_USERS, "Must be system or have"

                        + " INTERACT_ACROSS_USERS permission");

    }



    // to be used for TestApi methods that can only be called with SHELL UID.

    private void enforceShellOnly(int callingUid, String message) {

        if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID) {