Merge "old paths contains all entries when updating" into pi-dev am: f5cb5e5525 (290879a5) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

+0 −16

Original line number	Diff line number	Diff line
		@@ -16416,22 +16416,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,