Merge "isReservedSupported=true when running as container" (e0076e41) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/StorageStatsService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.content.pm.PackageStats;
		import android.content.pm.UserInfo;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Environment;
		import android.os.FileUtils;
		import android.os.Handler;
		@@ -169,7 +170,8 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		enforcePermission(Binder.getCallingUid(), callingPackage);

		if (volumeUuid == StorageManager.UUID_PRIVATE_INTERNAL) {
		return SystemProperties.getBoolean(StorageManager.PROP_HAS_RESERVED, false);
		return SystemProperties.getBoolean(StorageManager.PROP_HAS_RESERVED, false)
		\|\| Build.IS_CONTAINER;
		} else {
		return false;
		}