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

Commit 309335e7 authored by Benoit Lamarche's avatar Benoit Lamarche
Browse files

resolve merge conflicts of 57fb5872 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
parents 20041c2d 57fb5872

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

+17 −16
Original line number Diff line number Diff line
@@ -1616,18 +1616,19 @@ public class ApplicationsState { 
        }

    };



    public static final AppFilter FILTER_OTHER_APPS = new AppFilter() {

    public static final AppFilter FILTER_OTHER_APPS =

            new AppFilter() {

                @Override

        public void init() {

        }

                public void init() {}



                @Override

                public boolean filterApp(AppEntry entry) {

                    boolean isCategorized;

                    synchronized (entry) {

                isCategorized = entry.info.category == ApplicationInfo.CATEGORY_AUDIO ||

                    entry.info.category == ApplicationInfo.CATEGORY_GAME ||

                    entry.info.category == ApplicationInfo.CATEGORY_VIDEO;

                        isCategorized =

                                FILTER_AUDIO.filterApp(entry)

                                        || FILTER_GAMES.filterApp(entry)

                                        || FILTER_MOVIES.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
@@ -173,6 +173,13 @@ public class ApplicationsStateTest { 
                .isTrue();

    }



    @Test

    public void testOtherAppsRejectsLegacyGame() {

        mEntry.info.flags = ApplicationInfo.FLAG_IS_GAME;



        assertThat(ApplicationsState.FILTER_OTHER_APPS.filterApp(mEntry)).isFalse();

    }



    @Test

    public void testInstantFilterAcceptsInstantApp() {

        when(mEntry.info.isInstantApp()).thenReturn(true);