commit e6f635ff823499203ef8ab4c01de07ea0eb33ad9
author Doris Ling <dling@google.com> Tue Jun 07 17:56:00 2016 -0700
committer Doris Ling <dling@google.com> Wed Jun 08 11:49:47 2016 -0700
tree c587950c9279c21152faa7426561671ae0640777
parent d4e31320c1a607e37ace95a77ef012c362dd1004

Moved network settings reset away from Backup & reset.

Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 5b1d644..ddd45c3 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -72,6 +72,7 @@
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
+    private static final String KEY_NETWORK_RESET = "network_reset";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +337,12 @@
             p.setEnabled(!TetherSettings
                     .isProvisioningNeededButUnavailable(getActivity()));
         }
+
+        // Remove network reset if not allowed
+        if (RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+            removePreference(KEY_NETWORK_RESET);
+        }
     }
 
     @Override
@@ -470,6 +477,11 @@
                     result.add(KEY_WFC_SETTINGS);
                 }
 
+                if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                        UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+                    result.add(KEY_NETWORK_RESET);
+                }
+
                 return result;
             }
         };