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

Commit 81682ef1 authored by Kasia Krejszeff's avatar Kasia Krejszeff
Browse files

Flag cleanup 

Remove code references to the launched android.multiuser.support_autolock_for_private_space flag.

Bug: 303201022
Flag: EXEMPT flag cleanup
Test: TH
Change-Id: Ie42c9337830f1a62836042d3d8f14065d868e435
parent e5bc2710

core/java/android/content/pm/multiuser.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ flag { 
    bug: "312184187"

}



flag {

    name: "support_autolock_for_private_space"

    namespace: "profile_experiences"

    description: "Add support to lock private space automatically after a time period"

    bug: "303201022"

}



flag {

    name: "allow_resolver_sheet_for_private_space"

    namespace: "profile_experiences"

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

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


    @Test

    public void testEnabledFilterNotQuietRejectsInstantApp() {

        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

+0 −9
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.pm.UserProperties; 
import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.LongSparseArray;



import com.android.settingslib.testutils.shadow.ShadowPermissionChecker;
@@ -61,8 +60,6 @@ import java.util.concurrent.TimeUnit; 
@Config(shadows = {ShadowPermissionChecker.class})

public class RecentAppOpsAccessesTest {



    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

    private static final int TEST_UID = 1234;

    private static final long NOW = 1_000_000_000;  // Approximately 9/8/2001

    private static final long ONE_MIN_AGO = NOW - TimeUnit.MINUTES.toMillis(1);
@@ -140,8 +137,6 @@ public class RecentAppOpsAccessesTest { 


    @Test

    public void testGetAppList_quietModeDisabled_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

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



        List<RecentAppOpsAccess.Access> requests = mRecentAppOpsAccess.getAppList(false);
@@ -156,8 +151,6 @@ public class RecentAppOpsAccessesTest { 


    @Test

    public void testGetAppList_quietModeEnabledShowInQuietDefault_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

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

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

        when(mUserProperties.getShowInQuietMode())
@@ -175,8 +168,6 @@ public class RecentAppOpsAccessesTest { 


    @Test

    public void testGetAppList_quietModeEnabledShowInQuietHidden_shouldNotFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);

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

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

        when(mUserProperties.getShowInQuietMode())

services/core/java/com/android/server/pm/UserManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,6 @@ public class UserManagerService extends IUserManager.Stub { 


    private static boolean isAutoLockForPrivateSpaceEnabled() {

        return android.os.Flags.allowPrivateProfile()

                && Flags.supportAutolockForPrivateSpace()

                && android.multiuser.Flags.enablePrivateSpaceFeatures();

    }

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceMockedTest.java

+5 −31
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static android.multiuser.Flags.FLAG_DEMOTE_MAIN_USER; 
import static android.multiuser.Flags.FLAG_DISALLOW_REMOVING_LAST_ADMIN_USER;

import static android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES;

import static android.multiuser.Flags.FLAG_LOGOUT_USER_API;

import static android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE;

import static android.multiuser.Flags.FLAG_UNICORN_MODE_REFACTORING_FOR_HSUM_READ_ONLY;

import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE;

import static android.os.UserHandle.USER_SYSTEM;
@@ -675,8 +674,7 @@ public final class UserManagerServiceMockedTest { 
    @Test

    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES

    })

    public void testAutoLockOnDeviceLockForPrivateProfile() {

        int mainUser = mUms.getMainUserId();
@@ -698,8 +696,7 @@ public final class UserManagerServiceMockedTest { 
    @Test

    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES

    })

    public void testAutoLockOnDeviceLockForPrivateProfile_keyguardUnlocked() {

        assumeTrue(mUms.canAddPrivateProfile(0));
@@ -716,31 +713,10 @@ public final class UserManagerServiceMockedTest { 
                eq(privateProfileUser.id), eq(true), any(), any());

    }



    @Test

    @EnableFlags({FLAG_ALLOW_PRIVATE_PROFILE, FLAG_ENABLE_PRIVATE_SPACE_FEATURES})

    @DisableFlags(FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE)

    public void testAutoLockOnDeviceLockForPrivateProfile_flagDisabled() {

        int mainUser = mUms.getMainUserId();

        assumeTrue(mUms.canAddPrivateProfile(mainUser));

        UserManagerService mSpiedUms = spy(mUms);

        UserInfo privateProfileUser =

                mSpiedUms.createProfileForUserEvenWhenDisallowedWithThrow(PRIVATE_PROFILE_NAME,

                USER_TYPE_PROFILE_PRIVATE, 0, mainUser, null);



        mSpiedUms.tryAutoLockingPrivateSpaceOnKeyguardChanged(true);



        // Verify that no auto-lock operations take place

        verify((MockedVoidMethod) () -> Settings.Secure.getInt(any(),

                eq(Settings.Secure.PRIVATE_SPACE_AUTO_LOCK), anyInt()), never());

        Mockito.verify(mSpiedUms, never()).setQuietModeEnabledAsync(

                eq(privateProfileUser.id), eq(true), any(), any());

    }



    @Test

    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES

    })

    public void testAutoLockAfterInactityForPrivateProfile() {

        int mainUser = mUms.getMainUserId();
@@ -764,8 +740,7 @@ public final class UserManagerServiceMockedTest { 
    @Test

    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES

    })

    public void testSetOrUpdateAutoLockPreference_noPrivateProfile() {

        mUms.setOrUpdateAutoLockPreferenceForPrivateProfile(
@@ -780,8 +755,7 @@ public final class UserManagerServiceMockedTest { 
    @Test

    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES

    })

    public void testSetOrUpdateAutoLockPreference() {

        int mainUser = mUms.getMainUserId();