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

Commit 6d63103a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Use OS package name when identity cleared. 

If we pass through the original calling package name, it obviously
won't match UID 1000.

Bug: 78104140
Test: builds, boots
Change-Id: Id0acf0b038e25a113674fa2f43ff93ba05144c1f
parent 167032ab

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.usage;

package com.android.server.usage;





import static com.android.internal.util.ArrayUtils.defeatNullable;

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.AppOpsManager;

import android.app.usage.ExternalStorageStats;

import android.app.usage.ExternalStorageStats;
@@ -30,7 +31,6 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageStats;

import android.content.pm.PackageStats;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.net.TrafficStats;

import android.net.Uri;

import android.net.Uri;

import android.os.Binder;

import android.os.Binder;

import android.os.Environment;

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

            // Free space is usable bytes plus any cached data that we're

            // willing to automatically clear. To avoid user confusion, this

            // willing to automatically clear. To avoid user confusion, this

            // logic should be kept in sync with getAllocatableBytes().

            // logic should be kept in sync with getAllocatableBytes().

            if (isQuotaSupported(volumeUuid, callingPackage)) {

            if (isQuotaSupported(volumeUuid, PLATFORM_PACKAGE_NAME)) {

                final long cacheTotal = getCacheBytes(volumeUuid, callingPackage);

                final long cacheTotal = getCacheBytes(volumeUuid, PLATFORM_PACKAGE_NAME);

                final long cacheReserved = mStorage.getStorageCacheBytes(path, 0);

                final long cacheReserved = mStorage.getStorageCacheBytes(path, 0);

                final long cacheClearable = Math.max(0, cacheTotal - cacheReserved);

                final long cacheClearable = Math.max(0, cacheTotal - cacheReserved);