From 533dfdfbfdaa695a8d855a4de02c931baa351425 Mon Sep 17 00:00:00 2001
From: yuemingw <yuemingw@google.com>
Date: Wed, 10 Jan 2018 16:20:43 +0000
Subject: [PATCH] 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
---
 res/xml/network_and_internet.xml                             | 5 +++--
 .../src/com/android/settings/core/UserRestrictionTest.java   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index bc027d3554e..134f5b3546f 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -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"
diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
index ad00bd71e0d..da09d3cbb16 100644
--- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
+++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
@@ -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