Merge "Add null check before finish SystemUI Tuner's activity"

am: 5bb91bacc3 Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b
2016-11-10 20:06:34 +00:00
parent fbb980e57b 5bb91bacc3
commit 08978cd0fd
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
@@ -104,7 +104,9 @@ public class TunerFragment extends PreferenceFragment {
                TunerService.showResetRequest(getContext(), new Runnable() {
                    @Override
                    public void run() {
-                        getActivity().finish();
+                        if (getActivity() != null) {
+                            getActivity().finish();
+                        }
                    }
                });
                return true;