Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a228f69e authored by Risan's avatar Risan Committed by android-build-merger
Browse files

Merge "isReservedSupported=true when running as container" 

am: e0076e41

Change-Id: I8c384d6a250a03b1eeed2b701cc6d17cd85573f1
parents 461aef85 e0076e41

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }