Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b31dc31 authored by Ricky Wai's avatar Ricky Wai Committed by Automerger Merge Worker
Browse files

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

Change-Id: I05b049953da66e9dcc212a0586e92a98b13cca5e
parents d070311f 73a3ea81

services/core/java/com/android/server/am/ProcessList.java

+4 −3
Original line number Diff line number Diff line
@@ -2240,10 +2240,11 @@ public final class ProcessList { 
            if (mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)

                    && !storageManagerInternal.isExternalStorageService(uid)) {

                bindMountAppStorageDirs = true;

                if (!storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(),

                if (pkgDataInfoMap == null ||

                        !storageManagerInternal.prepareStorageDirs(userId, pkgDataInfoMap.keySet(),

                        app.processName)) {

                    // Cannot prepare Android/app and Android/obb directory,

                    // so we won't mount it in zygote.

                    // Cannot prepare Android/app and Android/obb directory or inode == 0,

                    // so we won't mount it in zygote, but resume the mount after unlocking device.

                    app.bindMountPending = true;

                    bindMountAppStorageDirs = false;

                }