Merge "clear calling identity on isPackageSuspended" into pi-dev

am: 15db763bca Change-Id: I928899df39d9fc3853cfb6ff683f5ee75cd7b3d2
2018-03-28 00:00:11 +00:00
parent 8817808d31 15db763bca
commit 4a79ab8450
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5969,6 +5969,7 @@ public class NotificationManagerService extends SystemService {
    }

    private boolean isPackageSuspendedForUser(String pkg, int uid) {
+        final long identity = Binder.clearCallingIdentity();
        int userId = UserHandle.getUserId(uid);
        try {
            return mPackageManager.isPackageSuspendedForUser(pkg, userId);
@@ -5977,6 +5978,8 @@ public class NotificationManagerService extends SystemService {
        } catch (IllegalArgumentException ex) {
            // Package not found.
            return false;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
        }
    }