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

Merge "Offer to "fixup" GIDs used for app data." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-04 21:18:16 +00:00
committed by Android (Google) Code Review
parent 2b285566a4 1566233bfd
commit 359ce10912
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/Installer.java
View File

@@ -66,6 +66,7 @@ public class Installer extends SystemService {
public static final int FLAG_FREE_CACHE_V2 = 1 << 13;
public static final int FLAG_FREE_CACHE_V2_DEFY_QUOTA = 1 << 14;
public static final int FLAG_FREE_CACHE_NOOP = 1 << 15;
public static final int FLAG_FORCE = 1 << 16;
private final boolean mIsolated;
@@ -202,6 +203,15 @@ public class Installer extends SystemService {
}
}
public void fixupAppData(String uuid, int flags) throws InstallerException {
if (!checkBeforeRemote()) return;
try {
mInstalld.fixupAppData(uuid, flags);
} catch (Exception e) {
throw InstallerException.from(e);
}
}
public void moveCompleteApp(String fromUuid, String toUuid, String packageName,
String dataAppName, int appId, String seInfo, int targetSdkVersion)
throws InstallerException {

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

@@ -2717,6 +2717,15 @@ public class PackageManagerService extends IPackageManager.Stub {
UserHandle.USER_SYSTEM, storageFlags, true /* migrateAppData */,
true /* onlyCoreApps */);
mPrepareAppDataFuture = SystemServerInitThreadPool.get().submit(() -> {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "fixup");
try {
mInstaller.fixupAppData(StorageManager.UUID_PRIVATE_INTERNAL,
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
} catch (InstallerException e) {
Slog.w(TAG, "Trouble fixing GIDs", e);
}
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
if (deferPackages == null || deferPackages.isEmpty()) {
return;
}