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

Merge "Cap user-visible cache size at quota." into oc-mr1-dev

Browse Source 
am: ea842b4e4c

Change-Id: I5e7e5b93e639166dd350701b5228088ca5f5b19b
This commit is contained in:
Daniel Nishi
2017-09-08 23:28:14 +00:00
committed by android-build-merger
parent c83e4e9624 ea842b4e4c
commit f917c62184
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -339,22 +339,31 @@ public class ApplicationsState {
synchronized (mEntriesMap) { synchronized (mEntriesMap) {
AppEntry entry = mEntriesMap.get(userId).get(packageName); AppEntry entry = mEntriesMap.get(userId).get(packageName);
if (entry != null && (entry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) { if (entry != null && (entry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
mBackgroundHandler.post(() -> { mBackgroundHandler.post(
() -> {
try { try {
final StorageStats stats = mStats.queryStatsForPackage( final StorageStats stats =
entry.info.storageUuid, packageName, UserHandle.of(userId)); mStats.queryStatsForPackage(
entry.info.storageUuid,
packageName,
UserHandle.of(userId));
final long cacheQuota =
mStats.getCacheQuotaBytes(
entry.info.storageUuid.toString(), entry.info.uid);
final PackageStats legacy = new PackageStats(packageName, userId); final PackageStats legacy = new PackageStats(packageName, userId);
legacy.codeSize = stats.getCodeBytes(); legacy.codeSize = stats.getCodeBytes();
legacy.dataSize = stats.getDataBytes(); legacy.dataSize = stats.getDataBytes();
legacy.cacheSize = stats.getCacheBytes(); legacy.cacheSize = Math.min(stats.getCacheBytes(), cacheQuota);
try { try {
mBackgroundHandler.mStatsObserver.onGetStatsCompleted(legacy, true); mBackgroundHandler.mStatsObserver.onGetStatsCompleted(
legacy, true);
} catch (RemoteException ignored) { } catch (RemoteException ignored) {
} }
} catch (NameNotFoundException | IOException e) { } catch (NameNotFoundException | IOException e) {
Log.w(TAG, "Failed to query stats: " + e); Log.w(TAG, "Failed to query stats: " + e);
try { try {
mBackgroundHandler.mStatsObserver.onGetStatsCompleted(null, false); mBackgroundHandler.mStatsObserver.onGetStatsCompleted(
null, false);
} catch (RemoteException ignored) { } catch (RemoteException ignored) {
} }
} }