diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-09-06 21:09:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-06 21:09:06 +0000 |
commit | 1cd624801265e4af0d3d91cd87b9a81e10e49dcc (patch) | |
tree | da3db258daf3b37c0fe846448f9cafc3df2724f4 | |
parent | 421c74f8e74c67c4ce41300880b8e52a6d1a4a41 (diff) | |
parent | efd1f1242b7010adbad19ccee2e3d3c2786bf374 (diff) | |
download | base-1cd624801265e4af0d3d91cd87b9a81e10e49dcc.tar.gz |
Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"
-rw-r--r-- | services/core/java/com/android/server/MountService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index cdd977be29ed..2cf93ab561c5 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -922,7 +922,7 @@ class MountService extends IMountService.Stub // 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 @@ class MountService extends IMountService.Stub } catch (NativeDaemonConnectorException ignored) { } - synchronized (mVolumes) { + synchronized (mLock) { mSystemUnlockedUsers = ArrayUtils.removeInt(mSystemUnlockedUsers, userId); } } |