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

am: 08978cd0fd

Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75

packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java

@@ -104,8 +104,10 @@ public class TunerFragment extends PreferenceFragment {
                 TunerService.showResetRequest(getContext(), new Runnable() {
                     @Override
                     public void run() {
+                        if (getActivity() != null) {
                             getActivity().finish();
                         }
+                    }
                 });
                 return true;
         }