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

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

Merge "Add work profile support for registering phone accounts with Telecom"

parents 642e11a3 f5c29834
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,9 @@ public class TelecomServiceImpl {

    private void enforceUserHandleMatchesCaller(PhoneAccountHandle accountHandle) {
        if (!Binder.getCallingUserHandle().equals(accountHandle.getUserHandle())) {
            throw new SecurityException("Calling UserHandle does not match PhoneAccountHandle's");
            // Enforce INTERACT_ACROSS_USERS if the calling user handle does not match
            // phoen account's user handle
            enforceInAppCrossUserPermission();
        }
    }

@@ -2544,6 +2546,12 @@ 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) {