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

Commit b9322f3e authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Enhance media temp-allowlist logging" into tm-dev am: e8f7dc02 am:... 

Merge "Enhance media temp-allowlist logging" into tm-dev am: e8f7dc02 am: 983d1f79 am: 15615df9 am: 2ef5dd0d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18820312



Change-Id: Ic31ecda4372c1b890b89aeb5f63ecd1d26a45ca8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a862e20 2ef5dd0d

services/core/java/com/android/server/media/MediaSessionService.java

+5 −3
Original line number Diff line number Diff line
@@ -563,14 +563,16 @@ public class MediaSessionService extends SystemService implements Monitor { 
        try {

            enforcePackageName(callingPackage, callingUid);

            if (targetUid != callingUid) {

                Log.d(TAG, "tempAllowlistTargetPkgIfPossible callingPackage:"

                        + callingPackage + " targetPackage:" + targetPackage

                        + " reason:" + reason);

                boolean canAllowWhileInUse = mActivityManagerLocal

                        .canAllowWhileInUsePermissionInFgs(callingPid, callingUid, callingPackage);

                boolean canStartFgs = canAllowWhileInUse

                        || mActivityManagerLocal.canStartForegroundService(callingPid, callingUid,

                        callingPackage);

                Log.i(TAG, "tempAllowlistTargetPkgIfPossible callingPackage:"

                        + callingPackage + " targetPackage:" + targetPackage

                        + " reason:" + reason

                        + (canAllowWhileInUse ? " [WIU]" : "")

                        + (canStartFgs ? " [FGS]" : ""));

                if (canAllowWhileInUse) {

                    mActivityManagerLocal.tempAllowWhileInUsePermissionInFgs(targetUid,

                            MediaSessionDeviceConfig