diff options
author | Xin Li <delphij@google.com> | 2022-10-06 12:02:24 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-10-06 12:02:24 -0700 |
commit | 5640ac095f4fe17cb4efdef0ea6e62519e9f9357 (patch) | |
tree | 8659e4d597e39613a17c433608397f77dfae839a | |
parent | a50293235e574b87e86997ceba705ce0fc2b49d7 (diff) | |
parent | 0e4c0ffd3cfad692c2ffe3ad520d7b21f6657035 (diff) | |
download | Camera2-5640ac095f4fe17cb4efdef0ea6e62519e9f9357.tar.gz |
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I7ff8a794872917caff27f540a29e77db7e9f5bb2
Change-Id: Id4129ed6adcd95fa494779e379c9deca1458d73a
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | src/com/android/camera/debug/DebugPropertyHelper.java | 8 | ||||
-rw-r--r-- | src/com/android/camera/util/ExifUtil.java | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index a3cad5888..5cf37d569 100644 --- a/Android.bp +++ b/Android.bp @@ -44,7 +44,7 @@ android_app { "20002000", ], - sdk_version: "current", + sdk_version: "system_current", product_specific: true, diff --git a/src/com/android/camera/debug/DebugPropertyHelper.java b/src/com/android/camera/debug/DebugPropertyHelper.java index 66ccaafee..85c0955df 100644 --- a/src/com/android/camera/debug/DebugPropertyHelper.java +++ b/src/com/android/camera/debug/DebugPropertyHelper.java @@ -16,7 +16,7 @@ package com.android.camera.debug; -import com.android.camera.util.SystemProperties; +import android.os.SystemProperties; public class DebugPropertyHelper { private static final String OFF_VALUE = "0"; @@ -38,6 +38,8 @@ public class DebugPropertyHelper { private static final String PROP_WRITE_CAPTURE_DATA = PREFIX + ".capture_write"; /** Is RAW support enabled. */ private static final String PROP_CAPTURE_DNG = PREFIX + ".capture_dng"; + /** Redacting EXIF manufacturer and model name. */ + private static final String PROP_REDACT_EXIF = PREFIX + ".redact_exif"; private static boolean isPropertyOn(String property) { return ON_VALUE.equals(SystemProperties.get(property, OFF_VALUE)); @@ -58,4 +60,8 @@ public class DebugPropertyHelper { public static boolean isCaptureDngEnabled() { return isPropertyOn(PROP_CAPTURE_DNG); } + + public static boolean isRedactExifEnabled() { + return isPropertyOn(PROP_REDACT_EXIF); + } } diff --git a/src/com/android/camera/util/ExifUtil.java b/src/com/android/camera/util/ExifUtil.java index 18150a0c8..5fae24984 100644 --- a/src/com/android/camera/util/ExifUtil.java +++ b/src/com/android/camera/util/ExifUtil.java @@ -20,6 +20,7 @@ import android.hardware.camera2.CaptureResult; import android.location.Location; import android.os.Build; +import com.android.camera.debug.DebugPropertyHelper; import com.android.camera.exif.ExifInterface; import com.android.camera.exif.Rational; import com.android.camera.one.v2.camera2proxy.CaptureResultProxy; @@ -113,8 +114,13 @@ public class ExifUtil { } private void addMakeAndModelToExif() { - addExifTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); - addExifTag(ExifInterface.TAG_MODEL, Build.MODEL); + if (DebugPropertyHelper.isRedactExifEnabled()) { + addExifTag(ExifInterface.TAG_MAKE, "CAM_YY"); + addExifTag(ExifInterface.TAG_MODEL, "CAM_XX"); + } else { + addExifTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); + addExifTag(ExifInterface.TAG_MODEL, Build.MODEL); + } } private void addImageDataToExif(TaskImageContainer.TaskImage image) { |