commit bc90ee8736f2f547fbb7013a9cf77db0bfa417ad
author Jorim Jaggi <jjaggi@google.com> Tue Apr 14 18:36:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 18:36:11 2015 +0000
tree 235391c0f160abc74d335025dbf970e510ece40c
parent 2533651570e42dc4b7efa004ffbd11092cf2412c
parent 02d548790bb40f7bdfd087b0c8b9a5e1374425a3

Merge "Fix crash in settings"

src/com/android/settings/FingerprintUiHelper.java

diff --git a/src/com/android/settings/FingerprintUiHelper.java b/src/com/android/settings/FingerprintUiHelper.java
index 20ad7fc..f4a0275 100644
--- a/src/com/android/settings/FingerprintUiHelper.java
+++ b/src/com/android/settings/FingerprintUiHelper.java
@@ -56,8 +56,10 @@
     }
 
     public void stopListening() {
-        mCancellationSignal.cancel();
-        mCancellationSignal = null;
+        if (mCancellationSignal != null) {
+            mCancellationSignal.cancel();
+            mCancellationSignal = null;
+        }
     }
 
     private void setFingerprintIconVisibility(boolean visible) {

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 1edc7a9..f67467b 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -65,33 +65,34 @@
                 return;
             }
             // TODO maybe show a progress dialog if this ends up taking a while
+            Context context = getActivity();
 
             ConnectivityManager connectivityManager = (ConnectivityManager)
-                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager != null) {
                 connectivityManager.factoryReset();
             }
 
             WifiManager wifiManager = (WifiManager)
-                    getActivity().getSystemService(Context.WIFI_SERVICE);
+                    context.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager != null) {
                 wifiManager.factoryReset();
             }
 
             TelephonyManager telephonyManager = (TelephonyManager)
-                    getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+                    context.getSystemService(Context.TELEPHONY_SERVICE);
             if (telephonyManager != null) {
                 telephonyManager.factoryReset(mSubId);
             }
 
             NetworkPolicyManager policyManager = (NetworkPolicyManager)
-                    getActivity().getSystemService(Context.NETWORK_POLICY_SERVICE);
+                    context.getSystemService(Context.NETWORK_POLICY_SERVICE);
             if (policyManager != null) {
                 String subscriberId = telephonyManager.getSubscriberId(mSubId);
                 policyManager.factoryReset(subscriberId);
             }
 
-            Toast.makeText(getActivity(), R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
+            Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
         }
     };