Merge "Follow installd API changes." am: 915f279556 am: 6b662722f0 am: 5e17fe3e8c (e1a774e3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/Installer.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -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,
		int dexoptNeeded, @Nullable String outputPath, int dexFlags,
		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;
		try {
		mInstalld.freeCache(uuid, freeStorageSize);
		mInstalld.freeCache(uuid, freeStorageSize, flags);
		} catch (Exception e) {
		throw InstallerException.from(e);
		}

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -3585,7 +3585,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		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;
		@@ -3614,7 +3614,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		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;
		@@ -3637,7 +3637,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		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);
		}
		@@ -13707,7 +13707,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		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) {