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

am: 08978cd0fd Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75
2016-11-10 20:12:34 +00:00
parent fdaf348734 08978cd0fd
commit 88ab92ce4c
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;