diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-27 22:30:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-27 22:30:41 +0000 |
commit | dcf1bbf9b1b642f963e183eba2bc72cd40af51c1 (patch) | |
tree | 4f48b791debf9d1845693d2b9d3811bfecaacb0d | |
parent | 38dd493b7794ff8d87e5313fb9d2975a028a53cd (diff) | |
parent | 7ff5201a822e693469679fb1ea647ac5ee1edfb2 (diff) | |
download | Camera2-dcf1bbf9b1b642f963e183eba2bc72cd40af51c1.tar.gz |
Merge "Always use setResultEx"
-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(); } |