commit 29b3e92296d7cdec0368890aa44cbe8ffb00e9bf
author yuanhuihui <yuanhuihui@xiaomi.com> Tue Sep 06 23:08:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 06 23:08:55 2016 +0000
tree 8fb68c4b32a05906a08aa89602e37cd5ef2781b0
parent 81d2c05da18d63883566ee058a89119d676f0ba9
parent b24828bd77c4c7071e67d95cd336a76cd6f53c26

Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 am: 130cb9232a
am: b24828bd77

Change-Id: Ic01c8c6ecf5c91e055fb05f6317d4d7ae71f1be6

services/core/java/com/android/server/MountService.java

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 0023e4b..dc48cea 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -922,7 +922,7 @@
 
         // Record user as started so newly mounted volumes kick off events
         // correctly, then synthesize events for any already-mounted volumes.
-        synchronized (mVolumes) {
+        synchronized (mLock) {
             for (int i = 0; i < mVolumes.size(); i++) {
                 final VolumeInfo vol = mVolumes.valueAt(i);
                 if (vol.isVisibleForRead(userId) && vol.isMountedReadable()) {
@@ -945,7 +945,7 @@
         } catch (NativeDaemonConnectorException ignored) {
         }
 
-        synchronized (mVolumes) {
+        synchronized (mLock) {
             mSystemUnlockedUsers = ArrayUtils.removeInt(mSystemUnlockedUsers, userId);
         }
     }