commit 8eef64f25181774c3112892ca222af3c1cf259c7
author Stuart Scott <stuartscott@google.com> Wed Apr 08 15:13:54 2015 -0700
committer Stuart Scott <stuartscott@google.com> Fri Apr 17 14:51:23 2015 -0700
tree 78e6fc9328a300691b74d733bccf07ecd176652c
parent b320e187c6eddc4a9d5f31d397f52500d38b4c05

Move factoryReset to service and protect.

bug:16161518
Change-Id: Ie83d3a486bf07d5f2073b23253d0d0351414e180

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 274534c..a88fdde 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1414,6 +1414,12 @@
                 null);
     }
 
+    private void enforceConnectivityInternalPermission() {
+        mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.CONNECTIVITY_INTERNAL,
+                "ConnectivityService");
+    }
+
     private String createTelUrl(String number) {
         if (TextUtils.isEmpty(number)) {
             return null;
@@ -2353,4 +2359,19 @@
 
         return true;
     }
+
+    @Override
+    public void factoryReset(int subId) {
+        enforceConnectivityInternalPermission();
+        if (SubscriptionManager.isUsableSubIdValue(subId)) {
+            // Enable data
+            setDataEnabled(subId, true);
+            // Set network selection mode to automatic
+            setNetworkSelectionModeAutomatic(subId);
+            // Set preferred mobile network type to the best available
+            setPreferredNetworkType(subId, Phone.PREFERRED_NT_MODE);
+            // Turn off roaming
+            SubscriptionManager.from(mApp).setDataRoaming(0, subId);
+        }
+    }
 }