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

Commit 533dfdfb authored by yuemingw's avatar yuemingw
Browse files

Block Settings APP UI when disallow_airplane_mode is set. 

Test: runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
Fix: 67675441

Change-Id: Ice234cecf4de191b797ad4219852cf821720ab78
parent de633573

res/xml/network_and_internet.xml

+3 −2
Original line number Diff line number Diff line
@@ -75,12 +75,13 @@ 
        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true" />



    <SwitchPreference

    <com.android.settingslib.RestrictedSwitchPreference

        android:key="toggle_airplane"

        android:title="@string/airplane_mode"

        android:icon="@drawable/ic_airplanemode_active"

        android:disableDependentsState="true"

        android:order="5" />

        android:order="5"

        settings:userRestriction="no_airplane_mode"/>



    <Preference

        android:fragment="com.android.settings.ProxySelector"

tests/unit/src/com/android/settings/core/UserRestrictionTest.java

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public class UserRestrictionTest { 
            UserManager.DISALLOW_FACTORY_RESET,

            UserManager.DISALLOW_CONFIG_TETHERING,

            UserManager.DISALLOW_CONFIG_VPN,

            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS

            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,

            UserManager.DISALLOW_AIRPLANE_MODE

    );



    @Before