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

media/java/android/mtp/MtpDatabase.java

+6 −2

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

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