commit 15db763bca1c2959be59c6619c0602bccb472443
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 22:57:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 22:57:23 2018 +0000
tree 8021123458b4e9b372ba90f00e6e0cd78e3466c1
parent f2977ce61eebd09e0fc0f3396756628251c92bca
parent 2be7a05a1cb78f20a900990e33d965b684803670

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

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

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 59cd561..210857e 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5969,6 +5969,7 @@
     }
 
     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 @@
         } catch (IllegalArgumentException ex) {
             // Package not found.
             return false;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }