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

Commit ad2b7756 authored by Jesse Evans's avatar Jesse Evans
Browse files

Fix instant app filtering in ApplicationsState 

This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).

Test: Added tests for the filter
      runtest -x packages/SettingsLib/tests/integ

Bug: 37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
parent 1ad7ff32

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

+2 −1
Original line number Diff line number Diff line
@@ -1502,7 +1502,8 @@ public class ApplicationsState { 


        @Override

        public boolean filterApp(AppEntry entry) {

            return (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;

            return !AppUtils.isInstant(entry.info)

                && (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;

        }

    };

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

+16 −0
Original line number Diff line number Diff line
@@ -200,6 +200,22 @@ public class ApplicationsStateTest { 
        assertThat(ApplicationsState.FILTER_ALL_ENABLED.filterApp(mEntry)).isFalse();

    }



    @Test

    public void testFilterWithDomainUrls() {

        mEntry.info.privateFlags |= ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS;

        // should included updated system apps

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

        assertThat(ApplicationsState.FILTER_WITH_DOMAIN_URLS.filterApp(mEntry))

                .isTrue();

        mEntry.info.privateFlags &= ~ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS;

        assertThat(ApplicationsState.FILTER_WITH_DOMAIN_URLS.filterApp(mEntry))

                .isFalse();

        mEntry.info.privateFlags |= ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS;

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

        assertThat(ApplicationsState.FILTER_WITH_DOMAIN_URLS.filterApp(mEntry))

                .isFalse();

    }



    @Test

    public void testDisabledFilterRejectsInstantApp() {

        mEntry.info.enabled = false;