commit 4ff606bac7a2da5f406193f04eb80b99b79cb52e
author Jordan Liu <jminjie@google.com> Tue Dec 26 00:49:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 26 00:49:23 2017 +0000
tree 9f61f9e4e2b9597b46fb6e001d245c9df8bc955d
parent 3e82384e91c490532e8bb4e7ad44f54d6ba6af50
parent c4a4058d3d3fa6f27db4088575165ce21f72c4ba

Merge "Disallow MobileNetworkSettings on secondary user"
am: c4a4058d3d

Change-Id: I436790a24841d70329ead05f0edc8f21cf9a3a5f

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 7a851de..5909f03 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -627,12 +627,6 @@
 
             bindNetworkQueryService();
 
-            if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
-                mUnavailable = true;
-                activity.setContentView(R.layout.telephony_disallowed_preference_screen);
-                return;
-            }
-
             addPreferencesFromResource(R.xml.network_setting_fragment);
 
             mButton4glte = (SwitchPreference)findPreference(BUTTON_4G_LTE_KEY);
@@ -693,7 +687,13 @@
         @Override
         public void onActivityCreated(Bundle savedInstanceState) {
             super.onActivityCreated(savedInstanceState);
-            initializeSubscriptions();
+            if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)
+                    || !mUm.isSystemUser()) {
+                mUnavailable = true;
+                getActivity().setContentView(R.layout.telephony_disallowed_preference_screen);
+            } else {
+                initializeSubscriptions();
+            }
         }
 
         private class PhoneChangeReceiver extends BroadcastReceiver {