diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-11-01 05:29:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-01 05:29:31 +0000 |
| commit | 6581739e2eca51bcf7223805d714dc55bd1f7e10 (patch) | |
| tree | 3f99cbcb6ae4e08d7bdf44f398da710a796ee83c | |
| parent | 04b74ae7db5da1ae91e7c2859725c15540fbf58e (diff) | |
| parent | 5d159d58a080b88c00f04c600b807178355ff3b2 (diff) | |
| download | Camera2-6581739e2eca51bcf7223805d714dc55bd1f7e10.tar.gz | |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d58eeff54f am: a0abba23df am: 5d159d58a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945
Change-Id: I6ca97ab0123a767158316e1d3d176aa2dc7a221a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e1e80d2d9..3093b2584 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1705,8 +1705,12 @@ public class CameraActivity extends QuickActivity private boolean shouldUseNoOpLocation () { String callingPackage = getCallingPackage(); if (callingPackage == null) { - // Activity not started through startActivityForResult. - return false; + if (isCaptureIntent()) { + // Activity not started through startActivityForResult. + return true; + } else { + callingPackage = mAppContext.getPackageName(); + } } PackageInfo packageInfo = null; try { |