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

am: 88ab92ce4c

Change-Id: I6abd73d3ce02dd33dc95c6132b1ff8aa4b13015c

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;