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

Commit d18a1cca authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev am: 5d340bce 

am: 942db562

Change-Id: If093400dfe80cd544df151fb8ee90878a9eecf51
parents 3f627f9b 942db562

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

                }

packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java

+7 −0
Original line number Diff line number Diff line
@@ -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;