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

Commit 26c48fac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I99813278,I6285042b 

* changes:
  Fix copypasta error.
  Aggressively clear cached data when forgetting.
parents 9669487d a3a43b09

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -1219,5 +1219,5 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    /** {@hide} */ public String[] getSplitCodePaths() { return splitSourceDirs; }

    /** {@hide} */ public String getResourcePath() { return scanPublicSourceDir; }

    /** {@hide} */ public String getBaseResourcePath() { return publicSourceDir; }

    /** {@hide} */ public String[] getSplitResourcePaths() { return splitSourceDirs; }

    /** {@hide} */ public String[] getSplitResourcePaths() { return splitPublicSourceDirs; }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    Slog.d(TAG, "Destroying " + ps.name + " because volume was forgotten");

                    deletePackage(ps.name, new LegacyPackageDeleteObserver(null).getBinder(),

                            UserHandle.USER_SYSTEM, PackageManager.DELETE_ALL_USERS);













                    // Try very hard to release any references to this package













                    // so we don't risk the system server being killed due to













                    // open FDs













                    AttributeCache.instance().removePackage(ps.name);















                }





























                mSettings.onVolumeForgotten(fsUuid);