commit 1a7730dc3f20ee354f0445ad803fa4ba69e51bba
author Stuart Scott <stuartscott@google.com> Mon Apr 20 17:57:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 17:57:37 2015 +0000
tree 3efccb6ddf19e9dabb3fabdaf4eece4294a7d500
parent 00b306bdc149beb8fa4f7c626758f7e193d13f86
parent 8eef64f25181774c3112892ca222af3c1cf259c7

Merge "Move factoryReset to service and protect."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c040410..c6ba22f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1419,6 +1419,12 @@
                 null);
     }
 
+    private void enforceConnectivityInternalPermission() {
+        mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.CONNECTIVITY_INTERNAL,
+                "ConnectivityService");
+    }
+
     private String createTelUrl(String number) {
         if (TextUtils.isEmpty(number)) {
             return null;
@@ -2358,4 +2364,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);
+        }
+    }
 }