Commit 8fbcb763 authored Sep 29, 2016 by Akira Oshimi Committed by Yoshinori Hirano Nov 10, 2016

Add null check before finish SystemUI Tuner's activity

SystemUI Tuner's activity changes to null when Multi-window's state is
changed after confirmation dialog about removing SystemUI Tuner is
shown. Then NullPointerException occurs by trying to finish the
activity to tap "REMOVE" button on the confirmation dialog.
So add null check before finish the activity.

Bug: 32786029
Test: manual - remove System UI Tuner on Multi-Window mode

Change-Id: I455d17c0c600eeb05c9dfb7d609d40307de2f855

parent 836e7405

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

+3 −1

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