Commit 7b857083 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Android] Add super method calls to onActivityResult overrides

This CL adds super.onActivityResult calls to all methods that override
onActivityResult in Activity and Fragment subclasses. This should fix
an issue when Fragment.onActivityResult isn't called when expected.
super.onActivityResult calls in activities that subclass
AppCompatActivity end up in FragmentActivity.onActivityResult that
dispatches onActivityResult calls to Fragments that have started
activities using Fragment.startActivityForResult.

Bug: 836921
Change-Id: I19550c7106ad01bf6acccb0fe0d985561c7a1f81
Reviewed-on: https://chromium-review.googlesource.com/1028690Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554421}
parent 1cc6de04
...@@ -553,11 +553,12 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl ...@@ -553,11 +553,12 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
@CallSuper @CallSuper
@Override @Override
public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) { public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) {
if (mWindowAndroid != null) { if (mWindowAndroid != null
return mWindowAndroid.onActivityResult(requestCode, resultCode, intent); && mWindowAndroid.onActivityResult(requestCode, resultCode, intent)) {
} else { return true;
return false;
} }
super.onActivityResult(requestCode, resultCode, intent);
return false;
} }
@CallSuper @CallSuper
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment