Merge changes from topic "priv_vendor_app" (70de9728) · Commits · e / os / android_frameworks_base

core/java/android/app/LoadedApk.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -638,8 +638,7 @@ public final class LoadedApk {
		final String defaultSearchPaths = System.getProperty("java.library.path");
		final boolean treatVendorApkAsUnbundled = !defaultSearchPaths.contains("/vendor/lib");
		if (mApplicationInfo.getCodePath() != null
		&& mApplicationInfo.getCodePath().startsWith("/vendor/")
		&& treatVendorApkAsUnbundled) {
		&& mApplicationInfo.isVendor() && treatVendorApkAsUnbundled) {
		isBundledApp = false;
		}

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

+13 −0

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

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

		/** @hide */
		@IntDef(flag = true, prefix = { "PRIVATE_FLAG_" }, value = {
		PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE,
		@@ -613,6 +620,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		PRIVATE_FLAG_PRIVILEGED,
		PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER,
		PRIVATE_FLAG_STATIC_SHARED_LIBRARY,
		PRIVATE_FLAG_VENDOR,
		PRIVATE_FLAG_VIRTUAL_PRELOAD,
		})
		@Retention(RetentionPolicy.SOURCE)
		@@ -1569,6 +1577,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		return (flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
		}

		/** @hide */
		public boolean isVendor() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_VENDOR) != 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
		@@ -6266,6 +6266,11 @@ public class PackageParser {
		return applicationInfo.isOem();
		}

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

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

core/java/android/content/pm/PermissionInfo.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,15 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		@SystemApi
		public static final int PROTECTION_FLAG_OEM = 0x4000;

		/**
		* Additional flag for {${link #protectionLevel}, corresponding
		* to the <code>vendorPrivileged</code> value of
		* {@link android.R.attr#protectionLevel}.
		*
		* @hide
		*/
		public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 0x8000;

		/**
		* Mask for {@link #protectionLevel}: the basic protection type.
		*/
		@@ -231,6 +240,12 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		if (level == PROTECTION_SIGNATURE_OR_SYSTEM) {
		level = PROTECTION_SIGNATURE \| PROTECTION_FLAG_PRIVILEGED;
		}
		if ((level & PROTECTION_FLAG_VENDOR_PRIVILEGED) != 0
		&& (level & PROTECTION_FLAG_PRIVILEGED) == 0) {
		// 'vendorPrivileged' must be 'privileged'. If not,
		// drop the vendorPrivileged.
		level = level & ~PROTECTION_FLAG_VENDOR_PRIVILEGED;
		}
		return level;
		}

		@@ -284,6 +299,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		if ((level & PermissionInfo.PROTECTION_FLAG_OEM) != 0) {
		protLevel += "\|oem";
		}
		if ((level & PermissionInfo.PROTECTION_FLAG_VENDOR_PRIVILEGED) != 0) {
		protLevel += "\|vendorPrivileged";
		}
		return protLevel;
		}

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

+33 −7

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

		final ArrayMap<String, ArraySet<String>> mVendorPrivAppPermissions = new ArrayMap<>();
		final ArrayMap<String, ArraySet<String>> mVendorPrivAppDenyPermissions = new ArrayMap<>();

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

		public static SystemConfig getInstance() {
		@@ -229,6 +232,14 @@ public class SystemConfig {
		return mPrivAppDenyPermissions.get(packageName);
		}

		public ArraySet<String> getVendorPrivAppPermissions(String packageName) {
		return mVendorPrivAppPermissions.get(packageName);
		}

		public ArraySet<String> getVendorPrivAppDenyPermissions(String packageName) {
		return mVendorPrivAppDenyPermissions.get(packageName);
		}

		public Map<String, Boolean> getOemPermissions(String packageName) {
		final Map<String, Boolean> oemPermissions = mOemPermissions.get(packageName);
		if (oemPermissions != null) {
		@@ -248,7 +259,7 @@ public class SystemConfig {

		// Allow Vendor to customize system configs around libs, features, permissions and apps
		int vendorPermissionFlag = ALLOW_LIBS \| ALLOW_FEATURES \| ALLOW_PERMISSIONS \|
		ALLOW_APP_CONFIGS;
		ALLOW_APP_CONFIGS \| ALLOW_PRIVAPP_PERMISSIONS;
		readPermissions(Environment.buildPath(
		Environment.getVendorDirectory(), "etc", "sysconfig"), vendorPermissionFlag);
		readPermissions(Environment.buildPath(
		@@ -587,7 +598,19 @@ public class SystemConfig {
		}
		XmlUtils.skipCurrentTag(parser);
		} else if ("privapp-permissions".equals(name) && allowPrivappPermissions) {
		readPrivAppPermissions(parser);
		// privapp permissions from system and vendor 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());
		if (vendor) {
		readPrivAppPermissions(parser, mVendorPrivAppPermissions,
		mVendorPrivAppDenyPermissions);
		} else {
		readPrivAppPermissions(parser, mPrivAppPermissions,
		mPrivAppDenyPermissions);
		}
		} else if ("oem-permissions".equals(name) && allowOemPermissions) {
		readOemPermissions(parser);
		} else {
		@@ -674,7 +697,10 @@ public class SystemConfig {
		}
		}

		void readPrivAppPermissions(XmlPullParser parser) throws IOException, XmlPullParserException {
		private void readPrivAppPermissions(XmlPullParser parser,
		ArrayMap<String, ArraySet<String>> grantMap,
		ArrayMap<String, ArraySet<String>> denyMap)
		throws IOException, XmlPullParserException {
		String packageName = parser.getAttributeValue(null, "package");
		if (TextUtils.isEmpty(packageName)) {
		Slog.w(TAG, "package is required for <privapp-permissions> in "
		@@ -682,11 +708,11 @@ public class SystemConfig {
		return;
		}

		ArraySet<String> permissions = mPrivAppPermissions.get(packageName);
		ArraySet<String> permissions = grantMap.get(packageName);
		if (permissions == null) {
		permissions = new ArraySet<>();
		}
		ArraySet<String> denyPermissions = mPrivAppDenyPermissions.get(packageName);
		ArraySet<String> denyPermissions = denyMap.get(packageName);
		int depth = parser.getDepth();
		while (XmlUtils.nextElementWithin(parser, depth)) {
		String name = parser.getName();
		@@ -711,9 +737,9 @@ public class SystemConfig {
		denyPermissions.add(permName);
		}
		}
		mPrivAppPermissions.put(packageName, permissions);
		grantMap.put(packageName, permissions);
		if (denyPermissions != null) {
		mPrivAppDenyPermissions.put(packageName, denyPermissions);
		denyMap.put(packageName, denyPermissions);
		}
		}