Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "old paths contains all entries when updating" into pi-dev

Browse Source 
am: f5cb5e5525

Change-Id: I13b2118b834e9f255c83cf737ae1d9e8d93c9245
This commit is contained in:
android-build-team Robot
2018-05-03 06:39:29 -07:00
committed by android-build-merger
parent 9413533125 f5cb5e5525
commit 9cfb90e85b
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -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) {
}

2
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -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);

16
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -16414,22 +16414,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,