Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "isReservedSupported=true when running as container"

Browse Source 
am: e0076e4145

Change-Id: I8c384d6a250a03b1eeed2b701cc6d17cd85573f1
This commit is contained in:
Risan
2018-10-31 11:10:19 -07:00
committed by android-build-merger
parent 461aef854d e0076e4145
commit a228f69e07
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usage/java/com/android/server/usage/StorageStatsService.java
View File

@@ -33,6 +33,7 @@ import android.content.pm.PackageStats;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.Handler; import android.os.Handler;
@@ -169,7 +170,8 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
enforcePermission(Binder.getCallingUid(), callingPackage); enforcePermission(Binder.getCallingUid(), callingPackage);
if (volumeUuid == StorageManager.UUID_PRIVATE_INTERNAL) { 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 { } else {
return false; return false;
} }