Merge "Clear binder id when determining external storage state" into mnc-dev

2015-07-14 19:39:13 +00:00
parent 66cc6bb65e 38c3dbb209
commit 8b6d5b6b6a
1 changed files with 9 additions and 2 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2602,8 +2602,15 @@ class MountService extends IMountService.Stub
        boolean foundPrimary = false;

        final int userId = UserHandle.getUserId(uid);
-        final boolean reportUnmounted = !mMountServiceInternal.hasExternalStorage(
-                uid, packageName);
+        final boolean reportUnmounted;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            reportUnmounted = !mMountServiceInternal.hasExternalStorage(
+                    uid, packageName);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }

        synchronized (mLock) {
            for (int i = 0; i < mVolumes.size(); i++) {