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

Commit e56af077 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Use OS package name when identity cleared." into pi-dev

am: 6ac9a23f

Change-Id: Idff51642de785375c35f32b2bd60bc2fd80272d8
parents c44a5780 6ac9a23f
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.server.usage;

import static com.android.internal.util.ArrayUtils.defeatNullable;
import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;

import android.app.AppOpsManager;
import android.app.usage.ExternalStorageStats;
@@ -30,7 +31,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageStats;
import android.content.pm.UserInfo;
import android.net.TrafficStats;
import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
@@ -207,8 +207,8 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
            // Free space is usable bytes plus any cached data that we're
            // willing to automatically clear. To avoid user confusion, this
            // logic should be kept in sync with getAllocatableBytes().
            if (isQuotaSupported(volumeUuid, callingPackage)) {
                final long cacheTotal = getCacheBytes(volumeUuid, callingPackage);
            if (isQuotaSupported(volumeUuid, PLATFORM_PACKAGE_NAME)) {
                final long cacheTotal = getCacheBytes(volumeUuid, PLATFORM_PACKAGE_NAME);
                final long cacheReserved = mStorage.getStorageCacheBytes(path, 0);
                final long cacheClearable = Math.max(0, cacheTotal - cacheReserved);