commit 783ff437698171a6c1a7291914b72b12edd5f9db
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 05:30:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 05:30:16 2016 +0000
tree 8ff6343c78988758c375ef27c32855f92a2489f4
parent 8c11340b0c0cd40ea1b5ef83299830ae6d8c665b
parent cb911e3402313fee7565b7a198dff301a6215cdb

Merge "Fix crash when rotating HighPowerDetail dialog"

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);
         }
     }