Merge "Fix crash when rotating HighPowerDetail dialog"

am: 783ff43769 Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859
2016-12-14 05:38:34 +00:00
parent 0d60028669 783ff43769
commit 7598c6201d
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);
        }
    }