diff options
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/IPackageManager.aidl | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 16 |
3 files changed, 2 insertions, 20 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index faf0d6878a63..617d756ff20e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -5333,8 +5333,8 @@ public final class ActivityThread extends ClientTransactionHandler { } } } - final List<String> oldPaths = - sPackageManager.getPreviousCodePaths(packageName); + final ArrayList<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, pkgInfo.getApplicationInfo(), oldPaths); pkgInfo.updateApplicationInfo(aInfo, oldPaths); } catch (RemoteException e) { } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 2be33e94dc25..c988fa907f86 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -644,8 +644,6 @@ interface IPackageManager { boolean isPackageDeviceAdminOnAnyUser(String packageName); - List<String> getPreviousCodePaths(in String packageName); - int getInstallReason(String packageName, int userId); ParceledListSlice getSharedLibraries(in String packageName, int flags, int userId); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 681b0c94367f..af5521d036af 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -16403,22 +16403,6 @@ public class PackageManagerService extends IPackageManager.Stub } } - @Override - public List<String> getPreviousCodePaths(String packageName) { - final int callingUid = Binder.getCallingUid(); - final List<String> result = new ArrayList<>(); - if (getInstantAppPackageName(callingUid) != null) { - return result; - } - final PackageSetting ps = mSettings.mPackages.get(packageName); - if (ps != null - && ps.oldCodePaths != null - && !filterAppAccessLPr(ps, callingUid, UserHandle.getUserId(callingUid))) { - result.addAll(ps.oldCodePaths); - } - return result; - } - private void replaceNonSystemPackageLIF(PackageParser.Package deletedPackage, PackageParser.Package pkg, final @ParseFlags int parseFlags, final @ScanFlags int scanFlags, UserHandle user, int[] allUsers, |