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

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

Change-Id: I4f4be50906bfff5ae4c3c8849fb2cb17ddea2093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Makoto Onuki
2022-06-10 21:39:14 +00:00
committed by Automerger Merge Worker

View File

@@ -563,14 +563,16 @@ public class MediaSessionService extends SystemService implements Monitor {
try { try {
enforcePackageName(callingPackage, callingUid); enforcePackageName(callingPackage, callingUid);
if (targetUid != callingUid) { if (targetUid != callingUid) {
Log.d(TAG, "tempAllowlistTargetPkgIfPossible callingPackage:"
+ callingPackage + " targetPackage:" + targetPackage
+ " reason:" + reason);
boolean canAllowWhileInUse = mActivityManagerLocal boolean canAllowWhileInUse = mActivityManagerLocal
.canAllowWhileInUsePermissionInFgs(callingPid, callingUid, callingPackage); .canAllowWhileInUsePermissionInFgs(callingPid, callingUid, callingPackage);
boolean canStartFgs = canAllowWhileInUse boolean canStartFgs = canAllowWhileInUse
|| mActivityManagerLocal.canStartForegroundService(callingPid, callingUid, || mActivityManagerLocal.canStartForegroundService(callingPid, callingUid,
callingPackage); callingPackage);
Log.i(TAG, "tempAllowlistTargetPkgIfPossible callingPackage:"
+ callingPackage + " targetPackage:" + targetPackage
+ " reason:" + reason
+ (canAllowWhileInUse ? " [WIU]" : "")
+ (canStartFgs ? " [FGS]" : ""));
if (canAllowWhileInUse) { if (canAllowWhileInUse) {
mActivityManagerLocal.tempAllowWhileInUsePermissionInFgs(targetUid, mActivityManagerLocal.tempAllowWhileInUsePermissionInFgs(targetUid,
MediaSessionDeviceConfig MediaSessionDeviceConfig