Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b24828bd77

Change-Id: Ic01c8c6ecf5c91e055fb05f6317d4d7ae71f1be6
This commit is contained in:
yuanhuihui
2016-09-06 23:08:55 +00:00
committed by android-build-merger
parent 81d2c05da1 b24828bd77
commit 29b3e92296
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/MountService.java
View File

@@ -922,7 +922,7 @@ class MountService extends IMountService.Stub
// Record user as started so newly mounted volumes kick off events // Record user as started so newly mounted volumes kick off events
// correctly, then synthesize events for any already-mounted volumes. // correctly, then synthesize events for any already-mounted volumes.
synchronized (mVolumes) { synchronized (mLock) {
for (int i = 0; i < mVolumes.size(); i++) { for (int i = 0; i < mVolumes.size(); i++) {
final VolumeInfo vol = mVolumes.valueAt(i); final VolumeInfo vol = mVolumes.valueAt(i);
if (vol.isVisibleForRead(userId) && vol.isMountedReadable()) { if (vol.isVisibleForRead(userId) && vol.isMountedReadable()) {
@@ -945,7 +945,7 @@ class MountService extends IMountService.Stub
} catch (NativeDaemonConnectorException ignored) { } catch (NativeDaemonConnectorException ignored) {
} }
synchronized (mVolumes) { synchronized (mLock) {
mSystemUnlockedUsers = ArrayUtils.removeInt(mSystemUnlockedUsers, userId); mSystemUnlockedUsers = ArrayUtils.removeInt(mSystemUnlockedUsers, userId);
} }
} }