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

Guard against null server

Browse Source 
If MtpService stops before MtpServer
shuts down, the server will be null,
so don't attempt to use it in that
case.

Bug: 76433619
Test: no errors
Change-Id: I6744cb78908e6a0663a4b60107d5c9c18dda62bb
This commit is contained in:
Jerry Zhang
2018-03-26 14:59:39 -07:00
parent 642c0be3f3
commit 2ecbc7acdb
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());
}