Commit Graph

702072 Commits

Author SHA1 Message Date
Jin Seok Park
4dbaec627c Add support for saving attributes for DNG files
Also add support for IMAGE_TYPE_UNKNOWN files that do not have an
identifiable file extension, but follows the TIFF specification.

Also fixes issue where certain thumbnail-only tags were not being
replaced after primary/preview/thumbnail image data was swapped.

Bug: 193010129, Bug: 193010735
Test: atest ExifInterfaceTest
Change-Id: I098cf1a0730d0cb0f1d6010a21b3ec7ada8dc6b7
2021-07-19 15:48:54 +09:00
TreeHugger Robot
3180134fb0 Merge "Update lock icon resources" into sc-dev am: e0f7994498 am: eafed763a8 am: 066ec26ae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: Ibdfc1affad31e21f78bcb1e5201f9c18982ce350
2021-07-17 05:09:06 +00:00
TreeHugger Robot
d112eb7211 Merge "Update lock icon resources" into sc-dev am: e0f7994498 am: 2e8d79c768 am: a3b7426a1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: Id0fb90857ecc25afc1320da478361e88a47a22aa
2021-07-17 05:08:51 +00:00
TreeHugger Robot
1151e50794 Merge "Update lock icon resources" into sc-dev am: e0f7994498 am: 3e5df435af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: I2f5f8adc4cc62247d7d209a0991ed7572d662cf8
2021-07-17 04:57:19 +00:00
TreeHugger Robot
066ec26ae3 Merge "Update lock icon resources" into sc-dev am: e0f7994498 am: eafed763a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: Ib5a9242859d4730c88bbfe3d66f602e41c1edcfc
2021-07-17 04:56:24 +00:00
TreeHugger Robot
a3b7426a1d Merge "Update lock icon resources" into sc-dev am: e0f7994498 am: 2e8d79c768
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: Ia727afec4c3f0cf141aa3546eed5054b3b3ece08
2021-07-17 04:56:05 +00:00
TreeHugger Robot
2e8d79c768 Merge "Update lock icon resources" into sc-dev am: e0f7994498
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: I7323692dc4204a0fc4e865a67249dd04a27bed7b
2021-07-17 04:46:41 +00:00
TreeHugger Robot
3e5df435af Merge "Update lock icon resources" into sc-dev am: e0f7994498
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: Icba8304cbcf4c4e3c8c998dc2b2fe24bb368cc71
2021-07-17 04:46:03 +00:00
TreeHugger Robot
eafed763a8 Merge "Update lock icon resources" into sc-dev am: e0f7994498
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15314160

Change-Id: If00021cf1b243e2389c483c1e642a75a47383cd2
2021-07-17 04:45:40 +00:00
TreeHugger Robot
e0f7994498 Merge "Update lock icon resources" into sc-dev 2021-07-17 04:33:52 +00:00
Kevin Chyn
944d1e31e0 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc am: 70bfb88c48 am: 0d6188bc68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: Ib60395fe810294c5415c48a72018807ddd170384
2021-07-17 04:25:48 +00:00
Kevin Chyn
9a49c8b849 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc am: 56180f6029 am: 8c27e63103
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: I71c069586218fac6b78c6b007ae808dbbdce3ead
2021-07-17 04:25:37 +00:00
Kevin Chyn
0d6188bc68 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc am: 70bfb88c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: Icc742402cb650fd87de94f48a5e27be56d43a0d7
2021-07-17 04:06:28 +00:00
Kevin Chyn
8c27e63103 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc am: 56180f6029
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: I5daea19bb9e04984ecb6aeab6f70d4becb9a0ac6
2021-07-17 04:06:07 +00:00
Kevin Chyn
466076ca8f Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc am: d5e97fb330
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: I143cb1914c236dd8baa8fd6d1e69c8a2c6533971
2021-07-17 04:05:44 +00:00
Kevin Chyn
56180f6029 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: I691477ab746376f25f649d1d904f5742e949df4a
2021-07-17 03:55:31 +00:00
Kevin Chyn
d5e97fb330 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: Ieb5be1b7940db0364a69b2bf9d7d92d5b2a7d2a4
2021-07-17 03:54:35 +00:00
Kevin Chyn
70bfb88c48 Merge "3/n: Add CoexCoordinator" into sc-dev am: 6cb9ecadfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305872

Change-Id: Ia76ede326c5e506867592de075f23d8b5729ae7c
2021-07-17 03:54:14 +00:00
Benedict Wong
fe0d080a64 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours am: 0f9858962d -s ours am: 187536ab53 -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: Iaa3420f8a8fa52c1e151b9dff33c2c64aaf5f78f
2021-07-17 03:40:48 +00:00
Benedict Wong
08802b2a28 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: ff3a9bf309 -s ours am: eeeadc8c6a -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I7950928e5c0678d8b7f2487dcf20223a8fafe2bd
2021-07-17 03:40:23 +00:00
Kevin Chyn
6cb9ecadfc Merge "3/n: Add CoexCoordinator" into sc-dev 2021-07-17 03:38:01 +00:00
Benedict Wong
187536ab53 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours am: 0f9858962d -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I9fc4292073858353ff931b6fc9fbb71ed93fd53f
2021-07-17 03:26:18 +00:00
Benedict Wong
eeeadc8c6a [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: ff3a9bf309 -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: Iac4f98f73ed494f49ef43dec96bdd836c47a485a
2021-07-17 03:26:07 +00:00
Benedict Wong
f2293b6095 [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 am: e3bd8db4b0 -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I8a49e6f3befffd9d9e99110f29de01de4fdb22c4
2021-07-17 03:25:41 +00:00
Benedict Wong
ff3a9bf309 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I151b67855b705197cb832caa32c91cc746569b56
2021-07-17 03:15:31 +00:00
Benedict Wong
e3bd8db4b0 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I0b1e3351139267820cecc01b2e6c1f499863590e
2021-07-17 03:14:37 +00:00
Benedict Wong
0f9858962d [automerger skipped] Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev am: 0df66631c0 -s ours
am skip reason: Merged-In Iec8dae701838794261957609bae4e270eaa9cdc7 with SHA-1 e8c548fd02 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316004

Change-Id: I4f2c4ebf109d48477f8acbeb2e34d3686b556d27
2021-07-17 03:13:39 +00:00
Benedict Wong
0df66631c0 Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev 2021-07-17 02:52:32 +00:00
TreeHugger Robot
b813e85856 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: abc1fb02ba am: 696d65e99c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I9b68deebfcf728770deb4e9926c878fdef05efb8
2021-07-17 02:23:53 +00:00
TreeHugger Robot
a218993d3c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 584fa3e8b4 am: ea7d74a270
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I487c3bbcc8a1f83346e966110d146ad447c2bd0b
2021-07-17 02:23:33 +00:00
Sally Qi
11addb2abe Merge "Migrate HWUI logs from SkDebugf to ALOGD" 2021-07-17 02:10:07 +00:00
TreeHugger Robot
696d65e99c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: abc1fb02ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I2477f6c2f69092dfa52b512966cea2b60bd7db37
2021-07-17 02:09:27 +00:00
TreeHugger Robot
ea7d74a270 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 584fa3e8b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I37cb99d03770a19d9b54798fec9ab588a81ce68e
2021-07-17 02:09:07 +00:00
TreeHugger Robot
56685c88b0 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3 am: 955c0a799c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: Ie7859fd24ee48136b8f36e773586772f75760ddd
2021-07-17 02:09:01 +00:00
TreeHugger Robot
584fa3e8b4 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: I4338b8db488e2aa35293bd1fbb7f5e225b7cb3ef
2021-07-17 01:56:18 +00:00
TreeHugger Robot
955c0a799c Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: If2850e102d85b1b86b22cf8a14031ce367a68739
2021-07-17 01:55:49 +00:00
TreeHugger Robot
abc1fb02ba Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13ff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: Ifc8b19042d6fd6b04d11c570b66bcae40421dc80
2021-07-17 01:55:28 +00:00
TreeHugger Robot
a687e13ff3 Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev 2021-07-17 01:40:25 +00:00
Li Li
7b29c795f9 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 2c02f91b4f am: 69e0fd3dee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ie7f31dbed51dfb0b4a4ba788e87715256ac43809
2021-07-17 01:32:18 +00:00
Li Li
69e0fd3dee Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 2c02f91b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: If04e89d462575ba394eb9391a727e356c99b7912
2021-07-17 01:23:14 +00:00
Li Li
ad1076b6f6 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 8f317f24e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: I1eee46fbc5afa3c54f0b28120856edc1c5451c0d
2021-07-17 01:22:27 +00:00
Li Li
7bc45ec816 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 7fd05db338 am: bef8b4dc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ieba3dfa123c4767fdd980f70a18baae752b67389
2021-07-17 01:16:03 +00:00
Automerger Merge Worker
4a9418e594 Merge "Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 1c21f45b75" into sc-v2-dev-plus-aosp am: 6159b3d033
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: I249a80e45b17a5f11d83950c8a805e5931d143e8
2021-07-17 01:15:50 +00:00
Curtis Belmonte
099c270224 Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 30e41cff70 am: ca87664c31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305883

Change-Id: If3060bd17dea8c953a03647564b8bbd7b90aea2e
2021-07-17 01:15:11 +00:00
Automerger Merge Worker
f44b11c650 Merge "Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: 3c5ddcdcc8" into sc-v2-dev-plus-aosp am: d6b61378ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: I47e2bb26e97406bd227f864821e6912aa80a1fe3
2021-07-17 01:14:43 +00:00
TreeHugger Robot
bda9b228bf Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fac0 am: bce70652d7 am: 66e16c89f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15311059

Change-Id: Ibe320f63d7592216a9568f25090eafd8e78ecc08
2021-07-17 01:14:14 +00:00
Li Li
8f317f24e5 Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: I6560f637fd45f0d2d2625993bb05ca529be34e6c
2021-07-17 01:08:44 +00:00
Li Li
2c02f91b4f Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: I450f0e8c71b619b8a905d9ce1e076328ba283b49
2021-07-17 01:08:40 +00:00
Li Li
bef8b4dc0a Merge "Disable unnecessary freezer dbg msg" into sc-dev am: 2a4ff35621 am: 7fd05db338
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187491

Change-Id: Ib359dca0e88c41ec3b72daf7ba1d1601dbe2861e
2021-07-17 00:57:56 +00:00
Automerger Merge Worker
6159b3d033 Merge "Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd am: 1c21f45b75" into sc-v2-dev-plus-aosp 2021-07-17 00:57:45 +00:00