KRIS CHEN
6d22a16098
Merge "Move udfps antispoof property to common g7 folder" into udc-dev am: fee239d2e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22216488
Change-Id: If292a3fcf5d677d0f6bc6d321b2c72a1b3bc3eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:53:41 +00:00
KRIS CHEN
fee239d2e8
Merge "Move udfps antispoof property to common g7 folder" into udc-dev
2023-03-24 03:25:01 +00:00
Steve Berbary
fe4743dd52
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
am: 6c1c8ce908
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: Ia8cbf06ad1401bd157a44f1874cc7e91d286b508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:56:05 +00:00
Steve Berbary
6c1c8ce908
Update bluejay SVN to 33 am: fa9b0a22c5
am: dfdc342d9e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: I9bbdc5c0a1a3251f88025a05f5ca9e570e2c97c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:25:14 +00:00
Steve Berbary
dfdc342d9e
Update bluejay SVN to 33 am: fa9b0a22c5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22239192
Change-Id: I75a94dc8f982a78b2422c7ce393d739037e5885b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 01:54:55 +00:00
Steve Berbary
fa9b0a22c5
Update bluejay SVN to 33
...
Bug: 272844037
Change-Id: I02329be6d3de72e3241c9a5bb6b37709285cbbb9
2023-03-24 00:19:17 +00:00
Beverly Tai
55f27462f7
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: I23a6aa2c162ae1bd2285dda5e05bc71cff9aaf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:48:41 +00:00
Beverly Tai
b1482ebe4e
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev
2023-03-23 17:42:12 +00:00
chenkris
54644ec14c
Move udfps antispoof property to common g7 folder
...
Bug: 270657514
Test: authenticate fake finger
Change-Id: Ie67c13f6ab9e420b66a8e1dc77a9b27fcde8b6e6
2023-03-23 07:43:51 +00:00
Chris Paulo
959c69113d
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: Id2d1e415c446664b0b85a0a0e77237f0d77387d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:58 +00:00
Chris Paulo
2cde2eea98
Merge "device/bluejay: Add adaptive haptics props" into udc-dev
2023-03-22 21:58:49 +00:00
Beverly
6bac44096a
Remove unused dimen auth_ripple_alpha_in_duration
...
Bug: 274785453
Test: device builds
Change-Id: I256a62c02ba499a43ded9d6c8cf84df7be11a0ae
2023-03-22 18:23:16 +00:00
Steve Berbary
2bd82fe257
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I716caf0e4ef106d75e6a59eae530a1597c3e0cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:18:03 +00:00
Steve Berbary
5b4000dc60
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I227895e754d1b285cd531e9c56a244325fcb6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:39:50 +00:00
Steve Berbary
ea6b93a09e
Update bluejay SVN to 32 am: 9a862afe32
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I8a9916a4e9f0021ee583ef15ea1086aaed5a9719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:03:27 +00:00
Steve Berbary
9a862afe32
Update bluejay SVN to 32
...
Bug: 272844037
Change-Id: Id5aa5823a335291fba6da3ffcb481b841ef459a7
2023-03-15 02:18:02 +00:00
Xin Li
411e3fd108
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: I0fe271e37c4a6d59f5a97eeee7f5ac29779b7b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:10:48 +00:00
Xin Li
fa51f861f0
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Id010420fb540974fcaa66796ecff2407b127c73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:06:18 +00:00
Steve Berbary
633a6c9355
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I07265ecece802f1e8965c82bc6f28254b39519b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:39:30 +00:00
Xin Li
942685b157
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Iba8c895f0cb45b4b3141bbd7c6601bdc9070f8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:12 +00:00
Steve Berbary
32dc0da8fe
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I89754947c5227298c7a8021b5577aa21cca65270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:02:04 +00:00
Xin Li
95e5714088
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Ie9a3fbd6589d2bc1d3fa5da7ebfb10404b8c5b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:19 +00:00
Steve Berbary
987ededda9
Update bluejay SVN to 31 am: de230640ea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: Id2426491851902500be621b4b229fd133c49ceb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:41:38 +00:00
Steve Berbary
de230640ea
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-14 20:15:44 +00:00
Xin Li
69ed58ce78
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ida9fbc6ddbc729103197f8f352c5251acaaeac3f
2023-03-13 23:09:07 -07:00
George Chang
295d0a762d
[NFC] Add antenna position coordinates am: b8a9fbf2db
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21919752
Change-Id: Ib5c3c00fbea1e96526764b0c44ecbe9a130fdc3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 07:59:59 +00:00
George Chang
b8a9fbf2db
[NFC] Add antenna position coordinates
...
Bug: 272406680
Test: manual
Change-Id: I219ebe937a57e02f0ba7d1701eb4dbe356c9d657
2023-03-09 08:49:01 +00:00
Chris Paulo
d4b713a196
device/bluejay: Add adaptive haptics props
...
Add default adaptive haptics props for bluejay.
Bug: 198239103
Test: Verified functionality
Change-Id: I43a0dc0a84d682d8f71ae4ebac14cc123bd60ec4
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2023-03-06 20:57:48 +00:00
Jeff Pu
1bfece1ab2
Merge "Remove fingerprint virtual hal from individual" into udc-dev am: 469a54c625
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21729853
Change-Id: Ib9fc0733418cccfefe7eac77116763b616a32ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:42:47 +00:00
Jeff Pu
469a54c625
Merge "Remove fingerprint virtual hal from individual" into udc-dev
2023-03-03 19:42:05 +00:00
Jeff Pu
4d3a27df78
Remove fingerprint virtual hal from individual
...
pixel device mk files since it is included in common one
Bug: 270940857
Test: manual build
Change-Id: I2a39eae0b849f35a9304e49ca7d0f83995c31871
2023-03-02 21:34:22 +00:00
Steve Berbary
b0cdd8fd04
Update bluejay SVN to 30 am: e5ddd8edf2
am: 1907fbc957
am: 4dca43fbb3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196
Change-Id: I41f828138fdb2b505449036bf428306feb829eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:02:41 +00:00
Steve Berbary
4dca43fbb3
Update bluejay SVN to 30 am: e5ddd8edf2
am: 1907fbc957
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196
Change-Id: I3ed491cab9da9924a1f3c5c3433b422d3d53452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:23:17 +00:00
Steve Berbary
1907fbc957
Update bluejay SVN to 30 am: e5ddd8edf2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21693196
Change-Id: I669fe7ab92ff4685d7f2db32c27d5769fb09e189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:48:04 +00:00
Steve Berbary
e5ddd8edf2
Update bluejay SVN to 30
...
Bug: 268558932
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-02 05:10:01 +00:00
TreeHugger Robot
155d2e6ae3
Merge "haptics: update hapitcs sink and slot setting" into udc-dev am: 9d0d844efc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21536456
Change-Id: Ia9604bf4e0ff53e66fbcac4390a21aa4f298424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:46:32 +00:00
TreeHugger Robot
9d0d844efc
Merge "haptics: update hapitcs sink and slot setting" into udc-dev
2023-02-28 14:31:44 +00:00
Steve Berbary
9c0c923ef0
Update bluejay SVN to 29 am: b50a7c52a7
am: 1129c16714
am: 3b4fcfec8c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142
Change-Id: I8dbf3e006978c71e04d4ec3aa1b0097f225a9643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:58:03 +00:00
Steve Berbary
3b4fcfec8c
Update bluejay SVN to 29 am: b50a7c52a7
am: 1129c16714
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142
Change-Id: I51b6c0a8c4a5a40db8c77f06be92ed06ff124379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 23:49:28 +00:00
Steve Berbary
1129c16714
Update bluejay SVN to 29 am: b50a7c52a7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21582142
Change-Id: I5d16b8e48619d872f5b6cd589e72b72ad4fa4c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 22:52:55 +00:00
Steve Berbary
b50a7c52a7
Update bluejay SVN to 29
...
Bug: 268558932
Change-Id: I2ade29622e6c01ade96a7b15609131635c7ac502
2023-02-24 20:56:14 +00:00
Tai Kuo
830adc99d1
haptics: update hapitcs sink and slot setting
...
Bug: 270023634
Test: trigger audio coupled haptics via sound picker app
Change-Id: I56368f7a6a5097825ea89dfba3880cae1b92f1e7
2023-02-22 21:50:33 +08:00
KRIS CHEN
81477881a7
Merge "Remove the redundant g7 ta loading in init.xxx.rc" into udc-dev
2023-02-21 09:11:04 +00:00
Kris Chen
c1296ab940
Remove the redundant g7 ta loading in init.xxx.rc
...
Bug: 264646112
Test: fingerprint works fine after device reboot
Change-Id: Ib0e0d55625d6376289d42ef96bbf067ed17715b9
2023-02-21 15:37:47 +08:00
Tai Kuo
180bc981d4
[automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f
-s ours am: 085828fa09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21502111
Change-Id: Id0f6f6281eb047406bbc7fc6c96240c08d0b89fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 11:30:51 +00:00
Tai Kuo
085828fa09
[automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 588ebb3a8f
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 37cc2e1944
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21502111
Change-Id: I4e12499ae2acc6439bc261843591d91cfc5edf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:20:32 +00:00
Tai Kuo
540f87d8e8
[automerger skipped] [DO NOT MERGE] device/bluejay: Change to use common vibrator HAL am: 37cc2e1944
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21502113
Change-Id: I7a62105877716fd9579ade41c88c89dbc7cc9dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 09:02:35 +00:00
Tai Kuo
588ebb3a8f
[DO NOT MERGE] device/bluejay: Change to use common vibrator HAL
...
Use common vibrator hal in hardware/google/pixel instead of
device/google/bluejay. This will use the common vibrator hal from now
on to support the adaptive haptics feature.
Bug: 198239103
Bug: 269762222
Test: Verified on device
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ic83c61df6297696c06e63a23241b308f92ac70bd
2023-02-20 13:42:12 +08:00
Tai Kuo
37cc2e1944
[DO NOT MERGE] device/bluejay: Change to use common vibrator HAL
...
Use common vibrator hal in hardware/google/pixel instead of
device/google/bluejay. This will use the common vibrator hal from now
on to support the adaptive haptics feature.
Bug: 198239103
Bug: 269762222
Test: Verified on device
Change-Id: Ic83c61df6297696c06e63a23241b308f92ac70bd
2023-02-20 13:41:42 +08:00
Xin Li
b2e4454be6
[automerger skipped] Merge TQ2A.230305.008 am: 3b882cdef8
-s ours am: 1d0128ca3c
-s ours
...
am skip reason: Merged-In If127a2710c6a3c685987bbc4a1c1b6e619ff781c with SHA-1 17f995666a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21429287
Change-Id: Ia6d024074b62989f0010eb61070b57cb7ed29ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 22:51:03 +00:00