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

am: c49702e4c0 Change-Id: I7d3c453536a272c969745ad2df4c9bf319efc19b
2016-11-10 20:24:23 +00:00
parent 9c8cc849d6 c49702e4c0
commit 4ad7ace5f7
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
@@ -102,7 +102,9 @@ public class TunerFragment extends PreferenceFragment {
                TunerService.showResetRequest(getContext(), new Runnable() {
                    @Override
                    public void run() {
-                        getActivity().finish();
+                        if (getActivity() != null) {
+                            getActivity().finish();
+                        }
                    }
                });
                return true;