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

Commit 39366c78 authored by Jigar Thakkar's avatar Jigar Thakkar
Browse files

Remove the handleInterleavedSettingsForPrivateSpace flag 

Removing the references to the flag since its already enabled

Bug: 409611788
Test: presubmits
Flag: EXEMPT flag cleanup
Change-Id: Ied32d2f9f5e7acb5bb011c5611504a53d96cc1dc
parent 41995c9d

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

+2 −4
Original line number Diff line number Diff line
@@ -1004,8 +1004,7 @@ public class ApplicationsState { 
                Log.i(TAG, "Rebuilding...");

            }

            for (AppEntry entry : apps) {

                if (android.multiuser.Flags.enablePrivateSpaceFeatures()

                        && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {

                if (android.multiuser.Flags.enablePrivateSpaceFeatures()) {

                    UserHandle userHandle = UserHandle.of(UserHandle.getUserId(entry.info.uid));

                    if (!profileHideInQuietModeStatus.containsKey(userHandle)) {

                        profileHideInQuietModeStatus.put(
@@ -1831,8 +1830,7 @@ public class ApplicationsState { 
         * quiet mode is enabled, false otherwise.

         */

        private boolean shouldHideInQuietMode(@NonNull UserManager userManager, int uid) {

            if (android.multiuser.Flags.enablePrivateSpaceFeatures()

                    && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {

            if (android.multiuser.Flags.enablePrivateSpaceFeatures()) {

                UserHandle userHandle = UserHandle.of(UserHandle.getUserId(uid));

                return isHideInQuietEnabledForProfile(userManager, userHandle);

            }

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

+1 −2
Original line number Diff line number Diff line
@@ -207,8 +207,7 @@ public class RecentAppOpsAccess { 
    }



    private boolean shouldHideUser(UserManager userManager, UserHandle userHandle) {

        if (android.multiuser.Flags.enablePrivateSpaceFeatures()

                && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {

        if (android.multiuser.Flags.enablePrivateSpaceFeatures()) {

            return userManager.isQuietModeEnabled(userHandle)

                    && userManager.getUserProperties(userHandle).getShowInQuietMode()

                            == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;

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

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


    @Test

    public void testEnabledFilterNotQuietRejectsInstantApp() {

        mSetFlagsRule.enableFlags(android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

        mSetFlagsRule.enableFlags(android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

        mEntry.info.enabled = true;

        assertThat(ApplicationsState.FILTER_ENABLED_NOT_QUIET.filterApp(mEntry)).isTrue();

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

packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/RecentAppOpsAccessesTest.java

+3 −6
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ public class RecentAppOpsAccessesTest { 
    @Test

    public void testGetAppList_quietModeDisabled_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(false);



        List<RecentAppOpsAccess.Access> requests = mRecentAppOpsAccess.getAppList(false);
@@ -158,8 +157,7 @@ public class RecentAppOpsAccessesTest { 
    @Test

    public void testGetAppList_quietModeEnabledShowInQuietDefault_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(true);

        when(mUserManager.getUserProperties(any())).thenReturn(mUserProperties);

        when(mUserProperties.getShowInQuietMode())
@@ -178,8 +176,7 @@ public class RecentAppOpsAccessesTest { 
    @Test

    public void testGetAppList_quietModeEnabledShowInQuietHidden_shouldNotFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(true);

        when(mUserManager.getUserProperties(any())).thenReturn(mUserProperties);

        when(mUserProperties.getShowInQuietMode())