Merge "Rename Build.IS_CONTAINER to IS_ARC" (cfd021a5) · Commits · e / os / android_frameworks_base

core/java/android/os/Build.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -1303,7 +1303,11 @@ public class Build {
		public static final boolean IS_USER = "user".equals(TYPE);

		/**
		* Whether this build is running inside a container.
		* Whether this build is running on ARC, the Android Runtime for Chrome
		* (https://chromium.googlesource.com/chromiumos/docs/+/master/containers_and_vms.md).
		* Prior to R this was implemented as a container but from R this will be
		* a VM. The name of the property remains ro.boot.conntainer as it is
		* referenced in other projects.
		*
		* We should try to avoid checking this flag if possible to minimize
		* unnecessarily diverging from non-container Android behavior.
		@@ -1314,7 +1318,7 @@ public class Build {
		* For higher-level behavior differences, other checks should be preferred.
		* @hide
		*/
		public static final boolean IS_CONTAINER =
		public static final boolean IS_ARC =
		SystemProperties.getBoolean("ro.boot.container", false);

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		public boolean isReservedSupported(String volumeUuid, String callingPackage) {
		if (volumeUuid == StorageManager.UUID_PRIVATE_INTERNAL) {
		return SystemProperties.getBoolean(StorageManager.PROP_HAS_RESERVED, false)
		\|\| Build.IS_CONTAINER;
		\|\| Build.IS_ARC;
		} else {
		return false;
		}