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

Commit 63ff81e7 authored by Steve Kondik's avatar Steve Kondik
Browse files

Another fix for protected apps on SD. 

This sets the resourcePath properly when it's null and we are in
forward-locked scan mode.  This happens when applications are present
in the forward-locked directories after a wipe (such as on SD).
parent 53820016

services/java/com/android/server/PackageManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -2188,6 +2188,11 @@ class PackageManagerService extends IPackageManager.Stub { 


            // Just create the setting, don't add it yet. For already existing packages

            // the PkgSetting exists already and doesn't have to be created.

            if (destResourceFile == null && ((scanMode&SCAN_FORWARD_LOCKED) != 0)) {

                // Resource file was null, but we are in forward locked mode.. fix that.

                destResourceFile = this.getFwdLockedResource(pkgName, destCodeFile.getAbsolutePath());

                pkg.mForwardLocked = true;

            }

            pkgSetting = mSettings.getPackageLP(pkg, suid, destCodeFile,

                            destResourceFile, pkg.applicationInfo.flags, true, false);

            if (pkgSetting == null) {