From 8c5591d104971b0ee9f7be40ae18159e7c323165 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 26 Apr 2020 04:20:23 -0400 Subject: [PATCH] android: EmulationActivity: Fix merge issue with onActivityResult. --- .../citra/citra_emu/activities/EmulationActivity.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 56050d39a..80cd48332 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -240,14 +240,6 @@ public final class EmulationActivity extends AppCompatActivity { .show(); } - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent result) { - super.onActivityResult(requestCode, resultCode, result); - if (requestCode == StillImageCameraHelper.REQUEST_CAMERA_FILE_PICKER) { - StillImageCameraHelper.OnFilePickerResult(resultCode == RESULT_OK ? result : null); - } - } - @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { switch (requestCode) { @@ -447,6 +439,9 @@ public final class EmulationActivity extends AppCompatActivity { protected void onActivityResult(int requestCode, int resultCode, Intent result) { super.onActivityResult(requestCode, resultCode, result); switch (requestCode) { + case StillImageCameraHelper.REQUEST_CAMERA_FILE_PICKER: + StillImageCameraHelper.OnFilePickerResult(resultCode == RESULT_OK ? result : null); + break; case REQUEST_SELECT_AMIIBO: // If the user picked a file, as opposed to just backing out. if (resultCode == MainActivity.RESULT_OK) {