| commit | 8c9e3db8d9d4031288d1779013bff6fab90e7f7c | [log] [tgz] |
|---|---|---|
| author | Zhendong Yang <zhendong.x.yang@sonymobile.com> | Wed Dec 14 05:53:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 05:53:04 2016 +0000 |
| tree | cce11c1981830712a25747ed34fd4b9d893c7438 | |
| parent | 4cce4c517034fc68446261a1e689a3a8e5e0c2e1 [diff] | |
| parent | 8711f4055d03577d5a5393b95563db69daf4ab66 [diff] |
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d am: 8711f4055d Change-Id: Idb2d601fa627dcb8268228435192392c760787d0
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); } }