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

am: 8711f4055d

Change-Id: Idb2d601fa627dcb8268228435192392c760787d0
This commit is contained in:
Zhendong Yang
2016-12-14 05:53:04 +00:00
committed by android-build-merger

View File

@@ -131,7 +131,7 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener,
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog); super.onDismiss(dialog);
Fragment target = getTargetFragment(); Fragment target = getTargetFragment();
if (target != null) { if (target != null && target.getActivity() != null) {
target.onActivityResult(getTargetRequestCode(), 0, null); target.onActivityResult(getTargetRequestCode(), 0, null);
} }
} }