Merge "[StorageStats] support apps uninstalled with DELETE_KEEP_DATA" into main (5de5e6ac) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.content.ContentProvider.isAuthorityRedirectedForCloneProfi
		import static android.content.Intent.ACTION_MAIN;
		import static android.content.Intent.CATEGORY_DEFAULT;
		import static android.content.Intent.CATEGORY_HOME;
		import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;
		import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;
		import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
		import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
		@@ -1514,6 +1515,11 @@ public class ComputerEngine implements Computer {
		ai.uid = UserHandle.getUid(userId, ps.getAppId());
		ai.primaryCpuAbi = ps.getPrimaryCpuAbiLegacy();
		ai.secondaryCpuAbi = ps.getSecondaryCpuAbiLegacy();
		ai.volumeUuid = ps.getVolumeUuid();
		ai.storageUuid = StorageManager.convert(ai.volumeUuid);
		if (ps.isDefaultToDeviceProtectedStorage()) {
		ai.privateFlags \|= PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;
		}
		ai.setVersionCode(ps.getVersionCode());
		ai.flags = ps.getFlags();
		ai.privateFlags = ps.getPrivateFlags();

+7 −3

Original line number	Diff line number	Diff line
		@@ -364,9 +364,11 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		if (appInfo.isSystemApp() && !appInfo.isUpdatedSystemApp()) {
		// We don't count code baked into system image
		} else {
		if (appInfo.getCodePath() != null) {
		codePaths = ArrayUtils.appendElement(String.class, codePaths,
		appInfo.getCodePath());
		}
		}

		final PackageStats stats = new PackageStats(TAG);
		try {
		@@ -418,9 +420,11 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		if (appInfo.isSystemApp() && !appInfo.isUpdatedSystemApp()) {
		// We don't count code baked into system image
		} else {
		if (appInfo.getCodePath() != null) {
		codePaths = ArrayUtils.appendElement(String.class, codePaths,
		appInfo.getCodePath());
		}
		}
		} catch (NameNotFoundException e) {
		throw new ParcelableException(e);
		}