diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-28 00:25:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-28 00:25:42 +0000 |
| commit | 96ca62a1940625d2029d94d9592f4c23870ed01f (patch) | |
| tree | d7952ca37223e8f9959b82938aaa4fd797ebb3d9 | |
| parent | a9d115a47782d30edc7bc4efeacb747b7ad3bca2 (diff) | |
| parent | 575d3c1fbc0c2fd76dd5f9fb7a834c9ef2b1d48c (diff) | |
| download | Camera2-96ca62a1940625d2029d94d9592f4c23870ed01f.tar.gz | |
Merge "Always use setResultEx" am: dcf1bbf9b1 am: 2a9c47c354 am: 575d3c1fbc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471
Change-Id: Ibea6545a083ab265da6f7b0cab30e76150d36e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b581c51bf..e1e80d2d9 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -2849,9 +2849,7 @@ public class CameraActivity extends QuickActivity } private void finishActivityWithIntentResult(int resultCode, Intent resultIntent) { - mResultCodeForTesting = resultCode; - mResultDataForTesting = resultIntent; - setResult(resultCode, resultIntent); + setResultEx(resultCode, resultIntent); finish(); } |