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"

Browse Source
This commit is contained in:
Mathieu Chartier
2018-07-16 23:16:13 +00:00
committed by Gerrit Code Review
parent fce4acd679 4cfaa2ebdb
commit 600aeb124b
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

@@ -5295,8 +5295,8 @@ public final class ActivityThread {
} }
} }
} }
final List<String> oldPaths = final ArrayList<String> oldPaths = new ArrayList<>();
sPackageManager.getPreviousCodePaths(packageName); LoadedApk.makePaths(this, loadedApk.getApplicationInfo(), oldPaths);
loadedApk.updateApplicationInfo(aInfo, oldPaths); loadedApk.updateApplicationInfo(aInfo, oldPaths);
} catch (RemoteException e) { } catch (RemoteException e) {
} }

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

@@ -648,8 +648,6 @@ interface IPackageManager {
boolean isPackageDeviceAdminOnAnyUser(String packageName); boolean isPackageDeviceAdminOnAnyUser(String packageName);
List<String> getPreviousCodePaths(in String packageName);
int getInstallReason(String packageName, int userId); int getInstallReason(String packageName, int userId);
ParceledListSlice getSharedLibraries(in String packageName, int flags, int userId); ParceledListSlice getSharedLibraries(in String packageName, int flags, int userId);

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

@@ -17901,22 +17901,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, private void replaceNonSystemPackageLIF(PackageParser.Package deletedPackage,
PackageParser.Package pkg, final int policyFlags, int scanFlags, UserHandle user, PackageParser.Package pkg, final int policyFlags, int scanFlags, UserHandle user,
int[] allUsers, String installerPackageName, PackageInstalledInfo res, int[] allUsers, String installerPackageName, PackageInstalledInfo res,