Merge "Clear calling identity when checking if NLS is trusted" into main (5b4e13aa) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12103,6 +12103,7 @@ public class NotificationManagerService extends SystemService {
	return true;		return true;
	}		}

			long token = Binder.clearCallingIdentity();
	try {		try {
	if (mPackageManager.checkUidPermission(RECEIVE_SENSITIVE_NOTIFICATIONS, uid)		if (mPackageManager.checkUidPermission(RECEIVE_SENSITIVE_NOTIFICATIONS, uid)
	== PERMISSION_GRANTED \|\| mPackageManagerInternal.isPlatformSigned(pkg)) {		== PERMISSION_GRANTED \|\| mPackageManagerInternal.isPlatformSigned(pkg)) {
	@@ -12129,6 +12130,8 @@ public class NotificationManagerService extends SystemService {
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.e(TAG, "Failed to check trusted status of listener", e);		Slog.e(TAG, "Failed to check trusted status of listener", e);
			} finally {
			Binder.restoreCallingIdentity(token);
	}		}
	return false;		return false;
	}		}