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

am: 8c9e3db8d9

Change-Id: Ib6d620f89225a8258b1671d206bb617e5d1bf56f
This commit is contained in:
Zhendong Yang
2016-12-14 06:00:07 +00:00
committed by android-build-merger

View File

@@ -138,7 +138,7 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli
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);
}
}