Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012 (b24828bd) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}