From 8fbcb7630a9ea29726274f474d4b7d0694d139f8 Mon Sep 17 00:00:00 2001
From: Akira Oshimi <akira.x.oshimi@sonymobile.com>
Date: Thu, 29 Sep 2016 12:17:24 +0900
Subject: [PATCH] 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
---
 .../src/com/android/systemui/tuner/TunerFragment.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
index 70f2fdcfa8d34..7afdbcb2e2776 100644
--- 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;