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

Commit 4c94341e authored by Wa Gao's avatar Wa Gao Committed by Joseph Annareddy
Browse files

Disable the ContentProtection setting switch bar when current user is a guest user. 

Bug: 337774836
Test: m -j256 Settings && atest
SettingsRoboTests:ContentProtectionTogglePreferenceControllerTest
Flag: EXEMPT bugfix

(cherry picked from commit baf50305)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ef16a8cbef5e0987a37c2fa9e5091672a3c8e4ab)
Merged-In: I36173b2e7027765b526dfa2ebca216a7de71e669
Change-Id: I36173b2e7027765b526dfa2ebca216a7de71e669
parent 01c54ca6

src/com/android/settings/security/ContentProtectionTogglePreferenceController.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.security; 


import android.content.ContentResolver;

import android.content.Context;

import android.os.UserManager;

import android.provider.Settings;

import android.widget.CompoundButton;

import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -91,6 +92,14 @@ public class ContentProtectionTogglePreferenceController extends TogglePreferenc 
        mEnforcedAdmin = getEnforcedAdmin();

        if (mSwitchBar != null && mEnforcedAdmin != null) {

            mSwitchBar.setDisabledByAdmin(mEnforcedAdmin);

            return;

        }



        UserManager userManager = mContext.getSystemService(UserManager.class);

        if (userManager != null

                && userManager.isGuestUser()

                && mSwitchBar != null) {

            mSwitchBar.setEnabled(false);

        }

    }

tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java

+40 −0
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.robolectric.Shadows.shadowOf;



import android.content.Context;

import android.platform.test.flag.junit.SetFlagsRule;
@@ -33,6 +36,7 @@ import androidx.preference.PreferenceScreen; 
import androidx.test.core.app.ApplicationProvider;



import com.android.settings.testutils.shadow.ShadowUtils;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settings.widget.SettingsMainSwitchPreference;

import com.android.settingslib.RestrictedLockUtils;
@@ -52,6 +56,7 @@ import org.robolectric.annotation.Config; 
@Config(

        shadows = {

            ShadowUtils.class,

            ShadowUserManager.class,

        })

public class ContentProtectionTogglePreferenceControllerTest {
@@ -65,10 +70,13 @@ public class ContentProtectionTogglePreferenceControllerTest { 
    private final Context mContext = ApplicationProvider.getApplicationContext();

    private ContentProtectionTogglePreferenceController mController;

    private int mSettingBackupValue;

    private ShadowUserManager mShadowUserManager;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mShadowUserManager = ShadowUserManager.getShadow();

        mShadowUserManager.setGuestUser(false);

        mController = new TestContentProtectionTogglePreferenceController();

        mSwitchPreference = new SettingsMainSwitchPreference(mContext);

        when(mMockScreen.findPreference(mController.getPreferenceKey()))
@@ -117,6 +125,7 @@ public class ContentProtectionTogglePreferenceControllerTest { 
        mController.updateState(mockSwitchPreference);



        verify(mockSwitchPreference, never()).setDisabledByAdmin(any());

        verify(mockSwitchPreference, never()).setEnabled(false);

    }



    @Test
@@ -132,6 +141,36 @@ public class ContentProtectionTogglePreferenceControllerTest { 
        mController.updateState(mockSwitchPreference);



        verify(mockSwitchPreference).setDisabledByAdmin(mAdmin);

        verify(mockSwitchPreference, never()).setEnabled(false);

    }



    @Test

    public void updateState_notFullyManagedMode_guestUser_switchBarDisabled() {

        mShadowUserManager.setGuestUser(true);

        SettingsMainSwitchPreference mockSwitchPreference =

                mock(SettingsMainSwitchPreference.class);

        when(mMockScreen.findPreference(any())).thenReturn(mockSwitchPreference);

        when(mockSwitchPreference.getKey()).thenReturn(mController.getPreferenceKey());



        mController = new TestContentProtectionTogglePreferenceController();

        mController.displayPreference(mMockScreen);

        mController.updateState(mockSwitchPreference);



        verify(mockSwitchPreference).setEnabled(false);

    }



    @Test

    public void updateState_notFullyManagedMode_nonGuestUser_switchBarEnabled() {

        SettingsMainSwitchPreference mockSwitchPreference =

                mock(SettingsMainSwitchPreference.class);

        when(mMockScreen.findPreference(any())).thenReturn(mockSwitchPreference);

        when(mockSwitchPreference.getKey()).thenReturn(mController.getPreferenceKey());



        mController = new TestContentProtectionTogglePreferenceController();

        mController.displayPreference(mMockScreen);

        mController.updateState(mockSwitchPreference);



        verify(mockSwitchPreference, never()).setEnabled(false);

    }



    @Test
@@ -155,6 +194,7 @@ public class ContentProtectionTogglePreferenceControllerTest { 
        mController.updateState(mockSwitchPreference);



        assertThat(mController.isChecked()).isFalse();

        verify(mockSwitchPreference, never()).setEnabled(false);

    }



    @Test