PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Count legacy games as games in Storage view."

Browse Source
This commit is contained in:
Daniel Nishi
2017-03-14 00:11:58 +00:00
committed by Android (Google) Code Review
parent d9c62979d7 fd82752694
commit 8325e80fdb
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
View File

@@ -98,6 +98,11 @@ public class StorageAsyncLoader
result.musicAppsSize += attributedAppSizeInBytes; result.musicAppsSize += attributedAppSizeInBytes;
break; break;
default: default:
// The deprecated game flag does not set the category.
if ((app.flags & ApplicationInfo.FLAG_IS_GAME) != 0) {
result.gamesSize += attributedAppSizeInBytes;
break;
}
result.otherAppsSize += attributedAppSizeInBytes; result.otherAppsSize += attributedAppSizeInBytes;
break; break;
} }

13
tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
View File

@@ -104,6 +104,19 @@ public class StorageAsyncLoaderTest {
assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0); assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
} }
@Test
public void testLegacyGamesAreFiltered() throws Exception {
ApplicationInfo info =
addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
info.flags = ApplicationInfo.FLAG_IS_GAME;
SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
assertThat(result.size()).isEqualTo(1);
assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(11L);
assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
}
@Test @Test
public void testCacheIsIgnored() throws Exception { public void testCacheIsIgnored() throws Exception {
addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED); addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);