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

Commit 534e7fdc authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Separate TelecomManager#isInSelfManagedCall APIs" into main

parents d16c11b5 4dc98dcc
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -2563,8 +2563,9 @@ public class TelecomServiceImpl {
         * @param packageName    the package name of the app to check calls for.
         * @param userHandle     the user handle on which to check for calls.
         * @param callingPackage The caller's package name.
         * @param detectForAllUsers indicates if calls should be detected across all users. If it is
         *                          set to true, the userHandle parameter is disregarded.
         * @param detectForAllUsers indicates if calls should be detected across all users. If the
         *                          caller does not have the ability to interact across users, get
         *                          managed calls for the caller instead.
         * @return {@code true} if there are ongoing calls, {@code false} otherwise.
         */
        @Override
@@ -2575,8 +2576,13 @@ public class TelecomServiceImpl {
                        "READ_PRIVILEGED_PHONE_STATE required.");
                // Ensure that the caller has the INTERACT_ACROSS_USERS permission if it's trying
                // to access calls that don't belong to it.
                if (detectForAllUsers || !Binder.getCallingUserHandle().equals(userHandle)) {
                if (detectForAllUsers || (userHandle != null
                        && !Binder.getCallingUserHandle().equals(userHandle))) {
                    enforceInAppCrossUserPermission();
                } else {
                    // If INTERACT_ACROSS_USERS doesn't need to be enforced, ensure that the user
                    // being checked is the caller.
                    userHandle = Binder.getCallingUserHandle();
                }

                Log.startSession("TSI.iISMC", Log.getPackageAbbreviation(callingPackage));