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

am: 8711f4055d Change-Id: Idb2d601fa627dcb8268228435192392c760787d0
2016-12-14 05:53:04 +00:00
parent 4cce4c5170 8711f4055d
commit 8c9e3db8d9
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -131,7 +131,7 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener,
    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);
        }
    }