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

Browse Source
This commit is contained in:
Ricky Wai
2020-04-20 13:32:25 +00:00
committed by Android (Google) Code Review
parent d9a9e55d9c 224703b359
commit 22646899b5
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

@@ -2240,10 +2240,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;
} }