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

Merge "Follow installd API changes." am: 915f279556

Browse Source 
am: 6b662722f0

Change-Id: Ia9406884d17226b10cae21fd2d98eecb9e5e7253
This commit is contained in:
Jeff Sharkey
2017-01-19 16:26:23 +00:00
committed by android-build-merger
parent b72c17afdc 6b662722f0
commit 5e17fe3e8c
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,6 +242,16 @@ public class Installer extends SystemService {
} }
} }
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, public void dexopt(String apkPath, int uid, @Nullable String pkgName, String instructionSet,
int dexoptNeeded, @Nullable String outputPath, int dexFlags, int dexoptNeeded, @Nullable String outputPath, int dexFlags,
String compilerFilter, @Nullable String volumeUuid, @Nullable String sharedLibraries) String compilerFilter, @Nullable String volumeUuid, @Nullable String sharedLibraries)
@@ -351,10 +361,10 @@ public class Installer extends SystemService {
} }
} }
public void freeCache(String uuid, long freeStorageSize) throws InstallerException { public void freeCache(String uuid, long freeStorageSize, int flags) throws InstallerException {
if (!checkBeforeRemote()) return; if (!checkBeforeRemote()) return;
try { try {
mInstalld.freeCache(uuid, freeStorageSize); mInstalld.freeCache(uuid, freeStorageSize, flags);
} catch (Exception e) { } catch (Exception e) {
throw InstallerException.from(e); throw InstallerException.from(e);
} }

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

@@ -3419,7 +3419,7 @@ public class PackageManagerService extends IPackageManager.Stub {
boolean success = true; boolean success = true;
synchronized (mInstallLock) { synchronized (mInstallLock) {
try { try {
mInstaller.freeCache(volumeUuid, freeStorageSize); mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) { } catch (InstallerException e) {
Slog.w(TAG, "Couldn't clear application caches: " + e); Slog.w(TAG, "Couldn't clear application caches: " + e);
success = false; success = false;
@@ -3448,7 +3448,7 @@ public class PackageManagerService extends IPackageManager.Stub {
boolean success = true; boolean success = true;
synchronized (mInstallLock) { synchronized (mInstallLock) {
try { try {
mInstaller.freeCache(volumeUuid, freeStorageSize); mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) { } catch (InstallerException e) {
Slog.w(TAG, "Couldn't clear application caches: " + e); Slog.w(TAG, "Couldn't clear application caches: " + e);
success = false; success = false;
@@ -3471,7 +3471,7 @@ public class PackageManagerService extends IPackageManager.Stub {
void freeStorage(String volumeUuid, long freeStorageSize) throws IOException { void freeStorage(String volumeUuid, long freeStorageSize) throws IOException {
synchronized (mInstallLock) { synchronized (mInstallLock) {
try { try {
mInstaller.freeCache(volumeUuid, freeStorageSize); mInstaller.freeCache(volumeUuid, freeStorageSize, 0);
} catch (InstallerException e) { } catch (InstallerException e) {
throw new IOException("Failed to free enough space", e); throw new IOException("Failed to free enough space", e);
} }
@@ -13072,7 +13072,7 @@ public class PackageManagerService extends IPackageManager.Stub {
origin.resolvedPath, isForwardLocked(), packageAbiOverride); origin.resolvedPath, isForwardLocked(), packageAbiOverride);
try { try {
mInstaller.freeCache(null, sizeBytes + lowThreshold); mInstaller.freeCache(null, sizeBytes + lowThreshold, 0);
pkgLite = mContainerService.getMinimalPackageInfo(origin.resolvedPath, pkgLite = mContainerService.getMinimalPackageInfo(origin.resolvedPath,
installFlags, packageAbiOverride); installFlags, packageAbiOverride);
} catch (InstallerException e) { } catch (InstallerException e) {