| commit | b521aeb9f7bbb2a0d7ee42d4035208b42d1a8dcd | [log] [tgz] |
|---|---|---|
| author | Zhendong Yang <zhendong.x.yang@sonymobile.com> | Wed Dec 14 06:00:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 06:00:07 2016 +0000 |
| tree | 657622a19e878c8cfe606eb55025e04bd2201ea9 | |
| parent | f869b14e25c0d6185cefede2300071b627c704f4 [diff] | |
| parent | 8c9e3db8d9d4031288d1779013bff6fab90e7f7c [diff] |
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d am: 8711f4055d am: 8c9e3db8d9 Change-Id: Ib6d620f89225a8258b1671d206bb617e5d1bf56f
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 580c59f..a59dc78 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -138,7 +138,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); } }