Commit 4ad7ace5 authored Nov 10, 2016 by Akira Oshimi Committed by android-build-merger Nov 10, 2016

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

Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bac am: 08978cd0 am: 88ab92ce
am: c49702e4

Change-Id: I7d3c453536a272c969745ad2df4c9bf319efc19b

parents 9c8cc849 c49702e4

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

+3 −1

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