Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev (02e00a37) · Commits · e / os / android_frameworks_base

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,9 @@ public class SystemConfig {
		// property for runtime configuration differentiation
		private static final String SKU_PROPERTY = "ro.boot.product.hardware.sku";

		// property for runtime configuration differentiation in vendor
		private static final String VENDOR_SKU_PROPERTY = "ro.boot.product.vendor.sku";

		// Group-ids that are given to all packages as read from etc/permissions/*.xml.
		int[] mGlobalGids;

		@@ -468,6 +471,17 @@ public class SystemConfig {
		readPermissions(Environment.buildPath(
		Environment.getVendorDirectory(), "etc", "permissions"), vendorPermissionFlag);

		String vendorSkuProperty = SystemProperties.get(VENDOR_SKU_PROPERTY, "");
		if (!vendorSkuProperty.isEmpty()) {
		String vendorSkuDir = "sku_" + vendorSkuProperty;
		readPermissions(Environment.buildPath(
		Environment.getVendorDirectory(), "etc", "sysconfig", vendorSkuDir),
		vendorPermissionFlag);
		readPermissions(Environment.buildPath(
		Environment.getVendorDirectory(), "etc", "permissions", vendorSkuDir),
		vendorPermissionFlag);
		}

		// Allow ODM to customize system configs as much as Vendor, because /odm is another
		// vendor partition other than /vendor.
		int odmPermissionFlag = vendorPermissionFlag;