Follow installd API changes.
Test: builds, boots, clearing strategy looks sane
Bug: 33965858
Change-Id: Ie5bbb71fb7a464999215c22e5a1fef0c07a620a4
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 98249dd1..04569c2 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -242,6 +242,16 @@
}
}
+ public void setAppQuota(String uuid, int userId, int appId, long cacheQuota)
+ throws InstallerException {
+ if (!checkBeforeRemote()) return;
+ try {
+ mInstalld.setAppQuota(uuid, userId, appId, cacheQuota);
+ } catch (Exception e) {
+ throw InstallerException.from(e);
+ }
+ }
+
public void dexopt(String apkPath, int uid, @Nullable String pkgName, String instructionSet,
int dexoptNeeded, @Nullable String outputPath, int dexFlags,
String compilerFilter, @Nullable String volumeUuid, @Nullable String sharedLibraries)
@@ -351,10 +361,10 @@
}
}
- public void freeCache(String uuid, long freeStorageSize) throws InstallerException {
+ public void freeCache(String uuid, long freeStorageSize, int flags) throws InstallerException {
if (!checkBeforeRemote()) return;
try {
- mInstalld.freeCache(uuid, freeStorageSize);
+ mInstalld.freeCache(uuid, freeStorageSize, flags);
} catch (Exception e) {
throw InstallerException.from(e);
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 7a547f0..07dbb17 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3395,7 +3395,7 @@
boolean success = true;
synchronized (mInstallLock) {
try {
- mInstaller.freeCache(volumeUuid, freeStorageSize);
+ mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) {
Slog.w(TAG, "Couldn't clear application caches: " + e);
success = false;
@@ -3424,7 +3424,7 @@
boolean success = true;
synchronized (mInstallLock) {
try {
- mInstaller.freeCache(volumeUuid, freeStorageSize);
+ mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) {
Slog.w(TAG, "Couldn't clear application caches: " + e);
success = false;
@@ -3447,7 +3447,7 @@
void freeStorage(String volumeUuid, long freeStorageSize) throws IOException {
synchronized (mInstallLock) {
try {
- mInstaller.freeCache(volumeUuid, freeStorageSize);
+ mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) {
throw new IOException("Failed to free enough space", e);
}
@@ -13030,7 +13030,7 @@
origin.resolvedPath, isForwardLocked(), packageAbiOverride);
try {
- mInstaller.freeCache(null, sizeBytes + lowThreshold);
+ mInstaller.freeCache(null, sizeBytes + lowThreshold, 0);
pkgLite = mContainerService.getMinimalPackageInfo(origin.resolvedPath,
installFlags, packageAbiOverride);
} catch (InstallerException e) {