commit 7598c6201dc14562c48d62dd3246902b193b7f9c
author Zhendong Yang <zhendong.x.yang@sonymobile.com> Wed Dec 14 05:38:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 05:38:34 2016 +0000
tree 7162d3191c5d076785bd9acb128a6f36e328cd9d
parent 0d60028669c51202c3fe00ba5f767e05ec555fbc
parent 783ff437698171a6c1a7291914b72b12edd5f9db

Merge "Fix crash when rotating HighPowerDetail dialog"
am: 783ff43769

Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859

src/com/android/settings/fuelgauge/HighPowerDetail.java

diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 6946f62..daa72da 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -131,7 +131,7 @@
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
         Fragment target = getTargetFragment();
-        if (target != null) {
+        if (target != null && target.getActivity() != null) {
             target.onActivityResult(getTargetRequestCode(), 0, null);
         }
     }