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

Merge "Check null pointer before using pkgDataInfoMap" into rvc-dev am: 22646899b5

Browse Source 
Change-Id: I96209504f343941d218c70d1306eb6eab08eb891
This commit is contained in:
Ricky Wai
2020-04-20 13:39:10 +00:00
committed by Automerger Merge Worker
parent af59867933 22646899b5
commit d52233d10f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -2272,10 +2272,11 @@ public final class ProcessList {
if (mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid) if (mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)
&& !storageManagerInternal.isExternalStorageService(uid)) { && !storageManagerInternal.isExternalStorageService(uid)) {
bindMountAppStorageDirs = true; bindMountAppStorageDirs = true;
if (!storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(), if (pkgDataInfoMap == null ||
!storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(),
app.processName)) { app.processName)) {
// Cannot prepare Android/app and Android/obb directory, // Cannot prepare Android/app and Android/obb directory or inode == 0,
// so we won't mount it in zygote. // so we won't mount it in zygote, but resume the mount after unlocking device.
app.bindMountPending = true; app.bindMountPending = true;
bindMountAppStorageDirs = false; bindMountAppStorageDirs = false;
} }