Merge changes from topic "product_partition" (ce6b2d6b) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ApplicationInfo.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int PRIVATE_FLAG_VENDOR = 1 << 18;

		/**
		* Value for {@linl #privateFlags}: whether this app is pre-installed on the
		* product partition of the system image.
		* @hide
		*/
		public static final int PRIVATE_FLAG_PRODUCT = 1 << 19;

		/** @hide */
		@IntDef(flag = true, prefix = { "PRIVATE_FLAG_" }, value = {
		PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE,
		@@ -619,6 +626,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		PRIVATE_FLAG_OEM,
		PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE,
		PRIVATE_FLAG_PRIVILEGED,
		PRIVATE_FLAG_PRODUCT,
		PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER,
		PRIVATE_FLAG_STATIC_SHARED_LIBRARY,
		PRIVATE_FLAG_VENDOR,
		@@ -1699,6 +1707,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_VENDOR) != 0;
		}

		/** @hide */
		public boolean isProduct() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PRODUCT) != 0;
		}

		/**
		* Returns whether or not this application was installed as a virtual preload.
		*/

core/java/android/content/pm/PackageParser.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -6392,6 +6392,11 @@ public class PackageParser {
		return applicationInfo.isVendor();
		}

		/** @hide */
		public boolean isProduct() {
		return applicationInfo.isProduct();
		}

		/** @hide */
		public boolean isPrivileged() {
		return applicationInfo.isPrivilegedApp();

core/java/android/os/Environment.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ public class Environment {
		private static final String ENV_OEM_ROOT = "OEM_ROOT";
		private static final String ENV_ODM_ROOT = "ODM_ROOT";
		private static final String ENV_VENDOR_ROOT = "VENDOR_ROOT";
		private static final String ENV_PRODUCT_ROOT = "PRODUCT_ROOT";

		/** {@hide} */
		public static final String DIR_ANDROID = "Android";
		@@ -62,6 +63,7 @@ public class Environment {
		private static final File DIR_OEM_ROOT = getDirectory(ENV_OEM_ROOT, "/oem");
		private static final File DIR_ODM_ROOT = getDirectory(ENV_ODM_ROOT, "/odm");
		private static final File DIR_VENDOR_ROOT = getDirectory(ENV_VENDOR_ROOT, "/vendor");
		private static final File DIR_PRODUCT_ROOT = getDirectory(ENV_PRODUCT_ROOT, "/product");

		private static UserEnvironment sCurrentUser;
		private static boolean sUserRequired;
		@@ -179,6 +181,16 @@ public class Environment {
		return DIR_VENDOR_ROOT;
		}

		/**
		* Return root directory of the "product" partition holding product-specific
		* customizations if any. If present, the partition is mounted read-only.
		*
		* @hide
		*/
		public static File getProductDirectory() {
		return DIR_PRODUCT_ROOT;
		}

		/**
		* Return the system directory for a user. This is for use by system
		* services to store files relating to the user. This directory will be

core/java/com/android/server/SystemConfig.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -149,6 +149,9 @@ public class SystemConfig {
		final ArrayMap<String, ArraySet<String>> mVendorPrivAppPermissions = new ArrayMap<>();
		final ArrayMap<String, ArraySet<String>> mVendorPrivAppDenyPermissions = new ArrayMap<>();

		final ArrayMap<String, ArraySet<String>> mProductPrivAppPermissions = new ArrayMap<>();
		final ArrayMap<String, ArraySet<String>> mProductPrivAppDenyPermissions = new ArrayMap<>();

		final ArrayMap<String, ArrayMap<String, Boolean>> mOemPermissions = new ArrayMap<>();

		public static SystemConfig getInstance() {
		@@ -240,6 +243,14 @@ public class SystemConfig {
		return mVendorPrivAppDenyPermissions.get(packageName);
		}

		public ArraySet<String> getProductPrivAppPermissions(String packageName) {
		return mProductPrivAppPermissions.get(packageName);
		}

		public ArraySet<String> getProductPrivAppDenyPermissions(String packageName) {
		return mProductPrivAppDenyPermissions.get(packageName);
		}

		public Map<String, Boolean> getOemPermissions(String packageName) {
		final Map<String, Boolean> oemPermissions = mOemPermissions.get(packageName);
		if (oemPermissions != null) {
		@@ -278,6 +289,14 @@ public class SystemConfig {
		Environment.getOemDirectory(), "etc", "sysconfig"), oemPermissionFlag);
		readPermissions(Environment.buildPath(
		Environment.getOemDirectory(), "etc", "permissions"), oemPermissionFlag);

		// Allow Product to customize system configs around libs, features, permissions and apps
		int productPermissionFlag = ALLOW_LIBS \| ALLOW_FEATURES \| ALLOW_PERMISSIONS \|
		ALLOW_APP_CONFIGS \| ALLOW_PRIVAPP_PERMISSIONS;
		readPermissions(Environment.buildPath(
		Environment.getProductDirectory(), "etc", "sysconfig"), productPermissionFlag);
		readPermissions(Environment.buildPath(
		Environment.getProductDirectory(), "etc", "permissions"), productPermissionFlag);
		}

		void readPermissions(File libraryDir, int permissionFlag) {
		@@ -598,15 +617,20 @@ public class SystemConfig {
		}
		XmlUtils.skipCurrentTag(parser);
		} else if ("privapp-permissions".equals(name) && allowPrivappPermissions) {
		// privapp permissions from system and vendor partitions are stored
		// privapp permissions from system, vendor and product partitions are stored
		// separately. This is to prevent xml files in the vendor partition from
		// granting permissions to priv apps in the system partition and vice
		// versa.
		boolean vendor = permFile.toPath().startsWith(
		Environment.getVendorDirectory().toPath());
		boolean product = permFile.toPath().startsWith(
		Environment.getProductDirectory().toPath());
		if (vendor) {
		readPrivAppPermissions(parser, mVendorPrivAppPermissions,
		mVendorPrivAppDenyPermissions);
		} else if (product) {
		readPrivAppPermissions(parser, mProductPrivAppPermissions,
		mProductPrivAppDenyPermissions);
		} else {
		readPrivAppPermissions(parser, mPrivAppPermissions,
		mPrivAppDenyPermissions);

core/jni/android_util_AssetManager.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,10 @@ static void NativeVerifySystemIdmaps(JNIEnv* /env/, jclass /clazz/) {
		argv[argc++] = AssetManager::OVERLAY_DIR;
		}

		if (stat(AssetManager::PRODUCT_OVERLAY_DIR, &st) == 0) {
		argv[argc++] = AssetManager::PRODUCT_OVERLAY_DIR;
		}

		// Finally, invoke idmap (if any overlay directory exists)
		if (argc > 5) {
		execv(AssetManager::IDMAP_BIN, (char* const*)argv);