Merge "Guard against null server" into pi-dev (bb54f62d) · Commits · e / os / android_frameworks_base

media/java/android/mtp/MtpDatabase.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -314,15 +314,19 @@ public class MtpDatabase implements AutoCloseable {
		public void addStorage(StorageVolume storage) {
		MtpStorage mtpStorage = mManager.addMtpStorage(storage);
		mStorageMap.put(storage.getPath(), mtpStorage);
		if (mServer != null) {
		mServer.addStorage(mtpStorage);
		}
		}

		public void removeStorage(StorageVolume storage) {
		MtpStorage mtpStorage = mStorageMap.get(storage.getPath());
		if (mtpStorage == null) {
		return;
		}
		if (mServer != null) {
		mServer.removeStorage(mtpStorage);
		}
		mManager.removeMtpStorage(mtpStorage);
		mStorageMap.remove(storage.getPath());
		}