summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: I7ff8a794872917caff27f540a29e77db7e9f5bb2 Change-Id: Id4129ed6adcd95fa494779e379c9deca1458d73a
2022-08-30Add property for redacting EXIF model and maker name am: d7fb362d8c am: ↵MingChe Chiang
0e4c0ffd3c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19729464 Change-Id: Ic973edc12592994bc08a9a896dbcfe907b54267a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30Add property for redacting EXIF model and maker name am: d7fb362d8cMingChe Chiang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19729464 Change-Id: I7a966e310973c277417586053fcdc6333bdba7ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Add property for redacting EXIF model and maker nameandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseMingChe Chiang
Redacting EXIF to be aligned with camera HAL when the property is true. Bug: 242039712 Test: AOSP camera Change-Id: I712cdec0bcfe02739e9a70bb06e84abe7bbecc17
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: a50293235e ↵Xin Li
-s ours am: 944ccccae2 -s ours am: 56fd455056 -s ours am: 25eb627c82 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I61c32633f323f381b23497b6479d8347553ed1e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 94f09e9e7a -s ours ↵Xin Li
am: 7a28d15e9d -s ours am: 81ab23ad01 -s ours am: c98e9766c8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: Ia01260b161a8483fe8a19106c49a665dc570d9cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: a50293235e ↵Xin Li
-s ours am: 944ccccae2 -s ours am: 56fd455056 -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I5a68fce3730e55f5b5a6c5211ce7db28d1c63ff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 94f09e9e7a -s ours ↵Xin Li
am: 7a28d15e9d -s ours am: 81ab23ad01 -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I10974b80628be2a76426dd078cb7047bbceab00b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: a50293235e ↵Xin Li
-s ours am: 944ccccae2 -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: Ia14a630cde717496aed87767c41f8d5243ce35a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 94f09e9e7a -s ours ↵Xin Li
am: 7a28d15e9d -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I8e75f329f43e75f9fd072664647504da8ee584c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: a50293235e ↵Xin Li
-s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I34a1504db099a2415709964cd8e86b0d4036a58b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 94f09e9e7a -s oursXin Li
am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2186753 Change-Id: I10e83c85b3fe8ef9e028a9e6699be1d3624b1d6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"Xin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I7ff8a794872917caff27f540a29e77db7e9f5bb2 Change-Id: I25ac445f23c66f561dee9afb0fc0343822236bd7
2022-08-11Merge "Remove deprecated NFC beam support" am: d62b4a89f9 am: 351b330bef am: ↵Alisher Alikhodjaev
462f0d5365 am: a7ba17f7ff am: 4d0cbdea1d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375 Change-Id: I0b2f970487418439a57788e7d66c9317e6793451 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "Remove deprecated NFC beam support" am: d62b4a89f9 am: 351b330bef am: ↵Alisher Alikhodjaev
462f0d5365 am: a7ba17f7ff Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375 Change-Id: Ic681d959271885447b1b836fd38e8c1f8b861a41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "Remove deprecated NFC beam support" am: d62b4a89f9 am: 351b330bef am: ↵Alisher Alikhodjaev
462f0d5365 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375 Change-Id: Ia1c3506877be26ee1654a493ea9635bbe2dc0b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "Remove deprecated NFC beam support" am: d62b4a89f9 am: 351b330befAlisher Alikhodjaev
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375 Change-Id: I98a0715c05838ce00c76ff3fc552a41279959ad0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Remove deprecated NFC beam support" am: d62b4a89f9temp_sam_242648940Alisher Alikhodjaev
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375 Change-Id: Ib81f4646b3cdaba78bda220a6f4384a16f0b0473 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Remove deprecated NFC beam support"Alisher Alikhodjaev
2022-08-10Remove deprecated NFC beam supportAlisher Alikhodjaev
Bug: 236980291 Test: build pass Change-Id: I7ff8a794872917caff27f540a29e77db7e9f5bb2
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
d722fcc6ec -s ours am: 78f19f89e4 -s ours am: 8aab372bd4 -s ours am: 930400153b -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19094652 Change-Id: I0d0d191539c6dc1075d8c02125b67610cdf996a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
d722fcc6ec -s ours am: 78f19f89e4 -s ours am: 8aab372bd4 -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19094652 Change-Id: I1beddd4b1bc69dffa30a4d05df4c03c7392073aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
d722fcc6ec -s ours am: 78f19f89e4 -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19094652 Change-Id: I8aaa86897933ab8d4920bded5a06adf04750cea1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
d722fcc6ec -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/19094652 Change-Id: I1bf206ddb10d07168e387cbdbf75b5fa4ea0ae8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363Xin Li
Bug: 236760014 Merged-In: I586642681ef257fee808cc17bf879c86ef346e76 Change-Id: I14ea149eac401b2b193f7e5e67803f0d3d75c642
2022-06-21Merge changes I3c779a0e,Ie3462a66 am: fe4760fa39 am: 7884a796e7 am: ↵Treehugger Robot
46a9876dcf am: 4e660e1d5b am: 21f88c09cf Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2064129 Change-Id: I320b1c416902f2f845c4120547345d1f54e3643a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Merge changes I3c779a0e,Ie3462a66 am: fe4760fa39 am: 7884a796e7 am: ↵Treehugger Robot
46a9876dcf am: 4e660e1d5b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2064129 Change-Id: If53e477f207f5a037ba1570dfc317f490821be99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Merge changes I3c779a0e,Ie3462a66 am: fe4760fa39 am: 7884a796e7 am: 46a9876dcfTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2064129 Change-Id: I8eec8355b3db3124e6a9ecf38fa72871f9d7f9d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Merge changes I3c779a0e,Ie3462a66 am: fe4760fa39 am: 7884a796e7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2064129 Change-Id: I06918d68d0fb0920ae088f6f402ef207105325c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Merge changes I3c779a0e,Ie3462a66 am: fe4760fa39Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2064129 Change-Id: I555a69836bcd01c8d6f9d4909ef9b319eec531ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Merge changes I3c779a0e,Ie3462a66Treehugger Robot
* changes: Camera2: remove unused drawables Camera2: remove duplicate getDisplayRotation()
2022-05-25[automerger skipped] Merge "Camera2: Invoke saveVideo when ↵Shuzhen Wang
mVideoFileDescriptor != null" am: f399d4cdcb am: db862b7a2f -s ours am: 24a69e1129 -s ours am: a602d72b2e -s ours am: 000960d45d -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1959715 Change-Id: I588282cad76daf25689605163526762623d8c551 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25[automerger skipped] Merge "Camera2: Invoke saveVideo when ↵Shuzhen Wang
mVideoFileDescriptor != null" am: f399d4cdcb am: db862b7a2f -s ours am: 24a69e1129 -s ours am: a602d72b2e -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1959715 Change-Id: I0f6b5756f6367e36e742baf4f9244b199241b688 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25[automerger skipped] Merge "Camera2: Invoke saveVideo when ↵Shuzhen Wang
mVideoFileDescriptor != null" am: f399d4cdcb am: db862b7a2f -s ours am: 24a69e1129 -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1959715 Change-Id: I8c6a842be4dd7154d906db63762ac091385c33c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25[automerger skipped] Merge "Camera2: Invoke saveVideo when ↵Shuzhen Wang
mVideoFileDescriptor != null" am: f399d4cdcb am: db862b7a2f -s ours am skip reason: Merged-In I586642681ef257fee808cc17bf879c86ef346e76 with SHA-1 4d60bff648 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1959715 Change-Id: I9b6a700cf85e4ef20136b5f9682787ff53ccd3a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25Merge "Camera2: Invoke saveVideo when mVideoFileDescriptor != null" am: ↵Shuzhen Wang
f399d4cdcb Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1959715 Change-Id: Ib6d28b70af9a26d3badc7ec97262b8895a61df0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25Merge "Camera2: Invoke saveVideo when mVideoFileDescriptor != null"Shuzhen Wang
2022-05-25Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: 683bdac642 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ifd8db122c00b4c724b4b805e6fdaaa2a0b28d340 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Merge "Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: ↵Automerger Merge Worker
4d60bff648 am: bb8ff8a223" into tm-d1-dev-plus-aosp am: ddb2781136 am: 94d232f9e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: I176c466331681ef7a250c2b3a3dc5953993812cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: 26b7f62921 am: de92a0c42e am: 91581d3b58 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: If272a619842f69d0161e9430f1e509e2a16677a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: bb8ff8a223 am: ba2bbfb04c am: 384cb61d96 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Id50ee0309e5b545a574509c41e94a24dc531210d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Merge "Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: ↵Automerger Merge Worker
4d60bff648 am: bb8ff8a223" into tm-d1-dev-plus-aosp am: ddb2781136 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ib6778100c77ea8bd8dd438e50eb7a7c57f2c1dda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: 26b7f62921 am: de92a0c42e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ic36ae8cb589a3ddd01290a70f036834ffb514fd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: bb8ff8a223 am: ba2bbfb04c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: I3926a0908b6744b934fd8263374d7642cbab9f3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Merge "Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: ↵Automerger Merge Worker
4d60bff648 am: bb8ff8a223" into tm-d1-dev-plus-aosp
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: bb8ff8a223 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: I7c9f362a0a7f7e872b5c2edec07f67913657c70a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: 26b7f62921 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ib645ff63b1a30c74f57cd84a4a897e7760ed0665 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648 ↵linghao.kong
am: bb8ff8a223 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ic74aa02bd450b4ca00de58348cece06f8688a1c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Camera2: Invoke saveVideo when mVideoFileDescriptor != null am: 4d60bff648linghao.kong
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/18547052 Change-Id: Ie00f298526b7f7562b520cc72d1afd1e23963417 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:42:51 +0000