Merge "Bugreport Manager service clear binder identity"

2019-03-15 14:13:43 +00:00
parent cae221acac 9394ea6c63
commit 1f6b8f50c1
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
+++ b/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
@@ -79,7 +79,12 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
        Preconditions.checkNotNull(bugreportFd);
        Preconditions.checkNotNull(listener);
        validateBugreportMode(bugreportMode);
-        ensureIsPrimaryUser();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ensureIsPrimaryUser();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }

        int callingUid = Binder.getCallingUid();
        mAppOps.checkPackage(callingUid, callingPackage);