Merge changes from topic "system_ext" (dee02a0f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -5168,7 +5168,8 @@ package android.os {
		method @NonNull public static java.io.File getOdmDirectory();
		method @NonNull public static java.io.File getOemDirectory();
		method @NonNull public static java.io.File getProductDirectory();
		method @NonNull public static java.io.File getProductServicesDirectory();
		method @Deprecated @NonNull public static java.io.File getProductServicesDirectory();
		method @NonNull public static java.io.File getSystemExtDirectory();
		method @NonNull public static java.io.File getVendorDirectory();
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ std::vector<std::string> PoliciesForPath(const std::string& apk_path) {
		{"/oem/", kPolicyOem},
		{"/product/", kPolicyProduct},
		{"/system/", kPolicySystem},
		{"/system_ext/", kPolicySystem},
		{"/vendor/", kPolicyVendor},
		};

+5 −5

Original line number	Diff line number	Diff line
		@@ -614,10 +614,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {

		/**
		* Value for {@link #privateFlags}: whether this app is pre-installed on the
		* google partition of the system image.
		* system_ext partition of the system image.
		* @hide
		*/
		public static final int PRIVATE_FLAG_PRODUCT_SERVICES = 1 << 21;
		public static final int PRIVATE_FLAG_SYSTEM_EXT = 1 << 21;

		/**
		* Indicates whether this package requires access to non-SDK APIs.
		@@ -713,7 +713,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		PRIVATE_FLAG_USE_EMBEDDED_DEX,
		PRIVATE_FLAG_PRIVILEGED,
		PRIVATE_FLAG_PRODUCT,
		PRIVATE_FLAG_PRODUCT_SERVICES,
		PRIVATE_FLAG_SYSTEM_EXT,
		PRIVATE_FLAG_PROFILEABLE_BY_SHELL,
		PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER,
		PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY,
		@@ -2047,8 +2047,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		}

		/** @hide */
		public boolean isProductServices() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PRODUCT_SERVICES) != 0;
		public boolean isSystemExt() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_SYSTEM_EXT) != 0;
		}

		/** @hide */

+2 −2

Original line number	Diff line number	Diff line
		@@ -6897,8 +6897,8 @@ public class PackageParser {
		}

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

		/** @hide */

+1 −1

Original line number	Diff line number	Diff line
		@@ -1186,7 +1186,7 @@ public class Build {
		ArrayList<Partition> partitions = new ArrayList();

		String[] names = new String[] {
		"bootimage", "odm", "product", "product_services", Partition.PARTITION_NAME_SYSTEM,
		"bootimage", "odm", "product", "system_ext", Partition.PARTITION_NAME_SYSTEM,
		"vendor"
		};
		for (String name : names) {