diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-27 23:42:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-27 23:42:43 +0000 |
| commit | 575d3c1fbc0c2fd76dd5f9fb7a834c9ef2b1d48c (patch) | |
| tree | 4f48b791debf9d1845693d2b9d3811bfecaacb0d | |
| parent | e56026eac6e58a72826becf2873b12a833b07573 (diff) | |
| parent | 2a9c47c35451139e53f754a865cb6c128df6ba36 (diff) | |
| download | Camera2-575d3c1fbc0c2fd76dd5f9fb7a834c9ef2b1d48c.tar.gz | |
Merge "Always use setResultEx" am: dcf1bbf9b1 am: 2a9c47c354
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471
Change-Id: I3ab0cdd4c82f88e527c1032c846a6f68166b9114
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(); } |