diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:36:13 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:36:13 +0000 |
| commit | 134f2aeb19fdb277cd59dc293b38e38733ddb5f5 (patch) | |
| tree | 042a1484342bfedcf4a0951d90e06b9b0ad9df6c | |
| parent | c480985eea3114d4c50a929d4acf84f069a7f8c8 (diff) | |
| parent | d58eeff54fd3a42ae1ed49b3983fb94dbfec2331 (diff) | |
| download | Camera2-aml_tz4_332714010.tar.gz | |
Snap for 11219529 from d58eeff54fd3a42ae1ed49b3983fb94dbfec2331 to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010
Change-Id: Ibe48619d9879cbcc85536470d0ad05dc5f12ab64
| -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 82b0953e7..701d86d89 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1735,8 +1735,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 { |