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"

Browse Source 
am: 1cd6248012

Change-Id: Ie1d930f8925431641932bf1c4c94df9e57ffefc5
This commit is contained in:
yuanhuihui
2016-09-06 21:15:46 +00:00
committed by android-build-merger
parent 0bb64f1b3e 1cd6248012
commit 130cb9232a
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);
} }
} }