Merge "Create app metadata folder only when needed" into main (74c4f561) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -1667,15 +1667,6 @@ public class PackageManagerServiceUtils {
		if (appMetadataFile.exists()) {
		return true;
		}
		if (isSystem) {
		try {
		makeDirRecursive(new File(appMetadataFilePath).getParentFile(), 0700);
		} catch (Exception e) {
		Slog.e(TAG, "Failed to create app metadata dir for package "
		+ pkg.getPackageName() + ": " + e.getMessage());
		return false;
		}
		}
		Map<String, Property> properties = pkg.getProperties();
		if (!properties.containsKey(PROPERTY_ANDROID_SAFETY_LABEL_PATH)) {
		return false;
		@@ -1684,6 +1675,15 @@ public class PackageManagerServiceUtils {
		if (!fileInAPkPathProperty.isString()) {
		return false;
		}
		if (isSystem && !appMetadataFile.getParentFile().exists()) {
		try {
		makeDirRecursive(appMetadataFile.getParentFile(), 0700);
		} catch (Exception e) {
		Slog.e(TAG, "Failed to create app metadata dir for package "
		+ pkg.getPackageName() + ": " + e.getMessage());
		return false;
		}
		}
		String fileInApkPath = fileInAPkPathProperty.getString();
		List<AndroidPackageSplit> splits = pkg.getSplits();
		for (int i = 0; i < splits.size(); i++) {