commit e091e832100c27d6e49569cd13cb8c3ac3cc9153
author Svet Ganov <svetoslavganov@google.com> Wed May 13 19:34:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 13 19:34:43 2015 +0000
tree e2676dd700a8aa007d5615ba7894f9d513a02fed
parent c31f1f32963534763aaf82ae2544f3a94f13edca
parent cc087f8219bf8dd606a46a18a2b0f57079c7ff8a

Merge "Clear calling identity when performing phone factory reset." into mnc-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3b629d5..e4b8c35 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2382,15 +2382,20 @@
     @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);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            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);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 }