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
This commit is contained in:
Daniel Nishi
2017-09-08 21:42:56 +00:00
committed by Android (Google) Code Review
parent aee278d6d8 587207150b
commit ea842b4e4c
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,26 +339,35 @@ 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 { () -> {
final StorageStats stats = mStats.queryStatsForPackage( try {
entry.info.storageUuid, packageName, UserHandle.of(userId)); final StorageStats stats =
final PackageStats legacy = new PackageStats(packageName, userId); mStats.queryStatsForPackage(
legacy.codeSize = stats.getCodeBytes(); entry.info.storageUuid,
legacy.dataSize = stats.getDataBytes(); packageName,
legacy.cacheSize = stats.getCacheBytes(); UserHandle.of(userId));
try { final long cacheQuota =
mBackgroundHandler.mStatsObserver.onGetStatsCompleted(legacy, true); mStats.getCacheQuotaBytes(
} catch (RemoteException ignored) { entry.info.storageUuid.toString(), entry.info.uid);
} final PackageStats legacy = new PackageStats(packageName, userId);
} catch (NameNotFoundException | IOException e) { legacy.codeSize = stats.getCodeBytes();
Log.w(TAG, "Failed to query stats: " + e); legacy.dataSize = stats.getDataBytes();
try { legacy.cacheSize = Math.min(stats.getCacheBytes(), cacheQuota);
mBackgroundHandler.mStatsObserver.onGetStatsCompleted(null, false); try {
} catch (RemoteException ignored) { mBackgroundHandler.mStatsObserver.onGetStatsCompleted(
} legacy, true);
} } catch (RemoteException ignored) {
}); }
} catch (NameNotFoundException | IOException e) {
Log.w(TAG, "Failed to query stats: " + e);
try {
mBackgroundHandler.mStatsObserver.onGetStatsCompleted(
null, false);
} catch (RemoteException ignored) {
}
}
});
} }
if (DEBUG_LOCKING) Log.v(TAG, "...requestSize releasing lock"); if (DEBUG_LOCKING) Log.v(TAG, "...requestSize releasing lock");
} }