Merge "Don't hold lock when calling into ExternalStorageService" into main (eccb3eed) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/storage/StorageSessionController.java

+20 −17

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ public final class StorageSessionController {
		StorageUserConnection connection = null;
		synchronized (mLock) {
		connection = mConnections.get(connectionUserId);
		}

		if (connection != null) {
		Slog.i(TAG, "Notifying volume state changed for session with id: " + sessionId);
		connection.notifyVolumeStateChanged(sessionId,
		@@ -165,7 +167,6 @@ public final class StorageSessionController {
		+ connectionUserId);
		}
		}
		}

		/**
		* Frees any cache held by ExternalStorageService.
		@@ -225,8 +226,11 @@ public final class StorageSessionController {
		String sessionId = vol.getId();
		int userId = getConnectionUserIdForVolume(vol);

		StorageUserConnection connection = null;
		synchronized (mLock) {
		StorageUserConnection connection = mConnections.get(userId);
		connection = mConnections.get(userId);
		}

		if (connection != null) {
		Slog.i(TAG, "Removed session for vol with id: " + sessionId);
		connection.removeSession(sessionId);
		@@ -236,7 +240,6 @@ public final class StorageSessionController {
		return null;
		}
		}
		}


		/**