From b798b1c484230aee090dcdd8e606631fd5061587 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Tue, 5 Sep 2017 17:40:05 -0700 Subject: [PATCH] Fix a bug where image apps were double-counted. The filter for photos apps includes them as well as the one for "other apps". This removes them out of other apps. Change-Id: I56058080b6492c054ea3171addd5ab343769bc9a Fixes: 65384691 Test: SettingsLib integ test --- .../settingslib/applications/ApplicationsState.java | 3 ++- .../settingslib/applications/ApplicationsStateTest.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index 87bf0de2b2c86..bf1bf34dc220d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -1665,7 +1665,8 @@ public class ApplicationsState { isCategorized = FILTER_AUDIO.filterApp(entry) || FILTER_GAMES.filterApp(entry) - || FILTER_MOVIES.filterApp(entry); + || FILTER_MOVIES.filterApp(entry) + || FILTER_PHOTOS.filterApp(entry); } return !isCategorized; } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java index 751b4ba316d70..d9ac262f44146 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java @@ -102,6 +102,13 @@ public class ApplicationsStateTest { assertThat(ApplicationsState.FILTER_OTHER_APPS.filterApp(mEntry)).isFalse(); } + @Test + public void testOtherAppsRejectsImageApp() { + mEntry.info.category = ApplicationInfo.CATEGORY_IMAGE; + + assertThat(ApplicationsState.FILTER_OTHER_APPS.filterApp(mEntry)).isFalse(); + } + @Test public void testOtherAppsAcceptsDefaultCategory() { mEntry.info.category = ApplicationInfo.CATEGORY_UNDEFINED;