commit 981d85874294656a51683ae6ecc6ba312d3635ce
author Stuart Scott <stuartscott@google.com> Tue Apr 21 14:09:50 2015 -0700
committer Stuart Scott <stuartscott@google.com> Mon Jun 01 16:31:14 2015 +0000
tree 37359f2d47472c5aecec8156717e40be27a08420
parent c7d8b5cdc88b2a6f1c2d6e3e84369ffbaa8df62d

Network Reset should have a lockdown like Factory Reset.

bug:20332322
Change-Id: Ie4f23a99d42665e2a67a84c93a1a63246cc28f75
(cherry picked from commit ed77b223a7e346caa3caf49b05cfb3fde3088c3d)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9992edf..41699cc 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -33,6 +33,7 @@
 import android.os.Process;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.telecom.PhoneAccount;
@@ -135,6 +136,7 @@
     private PhoneGlobals mApp;
     private Phone mPhone;
     private CallManager mCM;
+    private UserManager mUserManager;
     private AppOpsManager mAppOps;
     private MainThreadHandler mMainThreadHandler;
     private SubscriptionController mSubscriptionController;
@@ -742,6 +744,7 @@
         mApp = app;
         mPhone = phone;
         mCM = PhoneGlobals.getInstance().mCM;
+        mUserManager = (UserManager) app.getSystemService(Context.USER_SERVICE);
         mAppOps = (AppOpsManager)app.getSystemService(Context.APP_OPS_SERVICE);
         mMainThreadHandler = new MainThreadHandler();
         mTelephonySharedPreferences =
@@ -2382,9 +2385,14 @@
     @Override
     public void factoryReset(int subId) {
         enforceConnectivityInternalPermission();
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
+            return;
+        }
+
         final long identity = Binder.clearCallingIdentity();
         try {
-            if (SubscriptionManager.isUsableSubIdValue(subId)) {
+            if (SubscriptionManager.isUsableSubIdValue(subId) && !mUserManager.hasUserRestriction(
+                    UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
                 // Enable data
                 setDataEnabled(subId, true);
                 // Set network selection mode to automatic