Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against null server" into pi-dev

Browse Source 
am: bb54f62d1a

Change-Id: I6a35fcd7b27e04ae207fafca9f504bfaad174035
This commit is contained in:
Jerry Zhang
2018-03-27 18:52:15 +00:00
committed by android-build-merger
parent 5c7fe1524e bb54f62d1a
commit c5febd24e0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/mtp/MtpDatabase.java
View File

@@ -314,7 +314,9 @@ public class MtpDatabase implements AutoCloseable {
public void addStorage(StorageVolume storage) {
MtpStorage mtpStorage = mManager.addMtpStorage(storage);
mStorageMap.put(storage.getPath(), mtpStorage);
mServer.addStorage(mtpStorage);
if (mServer != null) {
mServer.addStorage(mtpStorage);
}
}
public void removeStorage(StorageVolume storage) {
@@ -322,7 +324,9 @@ public class MtpDatabase implements AutoCloseable {
if (mtpStorage == null) {
return;
}
mServer.removeStorage(mtpStorage);
if (mServer != null) {
mServer.removeStorage(mtpStorage);
}
mManager.removeMtpStorage(mtpStorage);
mStorageMap.remove(storage.getPath());
}