From 38c3dbb2092e153109503aa9487b15b11192d5c6 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Tue, 14 Jul 2015 11:27:06 -0700
Subject: [PATCH] Clear binder id when determining external storage state

bug:22472435

Change-Id: I5badd51cb9fb2244395880eb1bbff8f4aa0abb8c
---
 .../core/java/com/android/server/MountService.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index bc61c3d3bd803..0e158a2e59dc1 100644
--- 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++) {