Merge "isReservedSupported=true when running as container" am: e0076e4145

am: a228f69e07

Change-Id: I84eada2ee1e0f79985026ef382854bed752b5b26
This commit is contained in:
Risan
2018-10-31 13:55:31 -07:00
committed by android-build-merger

View File

@@ -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;
}