Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am: 08978cd0fd

am: 88ab92ce4c Change-Id: I6abd73d3ce02dd33dc95c6132b1ff8aa4b13015c
2016-11-10 20:18:09 +00:00
parent 90efd7bbb2 88ab92ce4c
commit c49702e4c0
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;