PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Block Settings APP UI when disallow_airplane_mode is set.

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

Change-Id: Ice234cecf4de191b797ad4219852cf821720ab78
This commit is contained in:
yuemingw
2018-01-10 16:20:43 +00:00
parent de63357366
commit 533dfdfbfd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/network_and_internet.xml
View File

@@ -75,12 +75,13 @@
settings:userRestriction="no_config_mobile_networks" settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true" /> settings:useAdminDisabledSummary="true" />
<SwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="toggle_airplane" android:key="toggle_airplane"
android:title="@string/airplane_mode" android:title="@string/airplane_mode"
android:icon="@drawable/ic_airplanemode_active" android:icon="@drawable/ic_airplanemode_active"
android:disableDependentsState="true" android:disableDependentsState="true"
android:order="5" /> android:order="5"
settings:userRestriction="no_airplane_mode"/>
<Preference <Preference
android:fragment="com.android.settings.ProxySelector" android:fragment="com.android.settings.ProxySelector"

3
tests/unit/src/com/android/settings/core/UserRestrictionTest.java
View File

@@ -63,7 +63,8 @@ public class UserRestrictionTest {
UserManager.DISALLOW_FACTORY_RESET, UserManager.DISALLOW_FACTORY_RESET,
UserManager.DISALLOW_CONFIG_TETHERING, UserManager.DISALLOW_CONFIG_TETHERING,
UserManager.DISALLOW_CONFIG_VPN, UserManager.DISALLOW_CONFIG_VPN,
UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
UserManager.DISALLOW_AIRPLANE_MODE
); );
@Before @Before