Chris Paulo
88b5969360
[automerger skipped] [DO NOT MERGE] bluejay/vibrator: Fix Capodetector on AoC restart am: 8f4e8161ee
am: 923375b7ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20750737
Change-Id: I1d5e2fa7b8085252b6a6abac5130735ed232e95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29 04:41:17 +00:00
TreeHugger Robot
2bd7b8bee7
Merge "[DO NOT MERGE] bluejay/vibrator: Fix Capodetector on AoC restart" into tm-qpr-dev am: 667c6a7b46
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20750737
Change-Id: Ic9ae6e52d6a7ed27ccbc31772c34b40ee1cd6b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29 04:06:03 +00:00
Chris Paulo
923375b7ca
[DO NOT MERGE] bluejay/vibrator: Fix Capodetector on AoC restart am: 8f4e8161ee
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20750737
Change-Id: I1466b323f8b9fe6e6c33d05ef3e1c9765c7b4feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29 04:06:00 +00:00
TreeHugger Robot
667c6a7b46
Merge "[DO NOT MERGE] bluejay/vibrator: Fix Capodetector on AoC restart" into tm-qpr-dev
2022-12-29 03:26:41 +00:00
Paul Scovanner
8693abdf0f
Update bluejay SVN to 23 am: 36730c7be2
am: ef20ebd4dd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20806563
Change-Id: Ica522433db2b941d8d501657b7554b970939d7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 23:27:48 +00:00
Paul Scovanner
ef20ebd4dd
Update bluejay SVN to 23 am: 36730c7be2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20806563
Change-Id: I6d7be73c3c8089a502641b1f060f57d87cdc88ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 22:48:56 +00:00
Android Build Coastguard Worker
52c74a012b
[coastguard skipped] Merge sparse cherrypicks from sparse-9292298-L16600000957892016 into tm-qpr1-release.
...
Change-Id: Ie691d19fbe4014ed78365df0645f51684f8fc57c
2022-12-22 21:48:53 +00:00
Android Build Coastguard Worker
f53aa62f3e
Merge cherrypicks of ['ag/20668927', 'ag/20806563'] into sparse-9292298-L16600000957892016.
...
Change-Id: I6820a82a6e8675c60d98782ca10738a2ddb53d3d
2022-12-22 21:42:07 +00:00
Paul Scovanner
27bf838b46
Update bluejay SVN to 23
...
Bug: 258811679
Change-Id: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
(cherry picked from commit 36730c7be2
)
Merged-In: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
2022-12-22 21:40:42 +00:00
Steve Berbary
4be6a67132
Update bluejay SVN to 22
...
Bug: 261738635
Change-Id: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
(cherry picked from commit bbab3bdc4f
)
Merged-In: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
2022-12-22 21:40:37 +00:00
Android Build Coastguard Worker
615ee16d6b
[coastguard skipped] Merge sparse cherrypicks from sparse-9429303-L12600000957873738 into tm-qpr1-release.
...
Change-Id: Ib6418099a8191f3c96ce36bdc73f1ae560c41115
2022-12-22 02:32:18 +00:00
Android Build Coastguard Worker
293558a7dd
Merge cherrypicks of ['ag/20668927', 'ag/20806563'] into sparse-9429303-L12600000957873738.
...
Change-Id: I894c19dda1865c597209c6824170032f32765d47
2022-12-22 02:25:24 +00:00
Paul Scovanner
97444812c1
Update bluejay SVN to 23
...
Bug: 258811679
Change-Id: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
(cherry picked from commit 36730c7be2
)
Merged-In: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
2022-12-22 02:24:31 +00:00
Steve Berbary
18b213a222
Update bluejay SVN to 22
...
Bug: 261738635
Change-Id: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
(cherry picked from commit bbab3bdc4f
)
Merged-In: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
2022-12-22 02:24:25 +00:00
Paul Scovanner
36730c7be2
Update bluejay SVN to 23
...
Bug: 258811679
Change-Id: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
2022-12-22 02:11:29 +00:00
Matt Buckley
3f0f3bc345
Merge "Disable HWUI adpf by default and enable in device.mk"
2022-12-21 18:46:17 +00:00
Ken Yang
1cd23d05ee
Merge "WLC: Include the wireless_charger from gs-common"
2022-12-21 08:36:14 +00:00
Ken Yang
6ffba15542
WLC: Include the wireless_charger from gs-common
...
Bug: 237600973
Change-Id: Ie61251922a6ec7a087a089902eaf2e5291e53342
Signed-off-by: Ken Yang <yangken@google.com>
2022-12-21 00:57:36 +00:00
Chris Paulo
8f4e8161ee
[DO NOT MERGE] bluejay/vibrator: Fix Capodetector on AoC restart
...
Update pointers used in protobuf interface for configuring the detector.
When AoC has an SSR, it causes CapoDetector to go down by null pointer
dereference.
Bug: 261349596
Test: Verified 10x forced AoC SSR
Change-Id: Ifd7fcbbff4639f552c6708b5b171f0b3c9164c03
Signed-off-by: Chris Paulo <chrispaulo@google.com>
2022-12-15 21:33:17 +00:00
Android Build Coastguard Worker
c7c9b6b737
Merge cherrypicks of ['ag/20668927'] into tm-qpr1-release.
...
Change-Id: I928fac1241d24e099ca00c735a5f83c18804d009
2022-12-14 02:27:48 +00:00
Steve Berbary
0ea97bc369
Update bluejay SVN to 22
...
Bug: 261738635
Change-Id: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
(cherry picked from commit bbab3bdc4f
)
Merged-In: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
2022-12-14 02:21:19 +00:00
Cyril Lee
416c416285
Merge "Enable quick start for pixel devices"
2022-12-13 03:08:18 +00:00
Automerger Merge Worker
f485a3e5ce
Merge "[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours" into stage-aosp-master am: 492f9e2c50
-s ours am: 86ebfe2cdd
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: I695fd36e89e57a4531a320b7ee1d53be7e71e310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:50:27 +00:00
Xin Li
0fbe0b6a23
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours am: 6751e0d3c8
-s ours am: 52801d239b
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: I11900b8ff2395393b1731d90d395a85ed35cf624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:47:54 +00:00
Xin Li
b2308de2b0
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours am: d4d5b9ae3e
-s ours am: d77d61080c
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: I9830c3d52de5cc2fb4df50f9b1452b6d4fb33d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 11:57:00 +00:00
Automerger Merge Worker
86ebfe2cdd
Merge "[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours" into stage-aosp-master am: 492f9e2c50
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: If84889f5f3e4482076a4689cf481911ced769a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:59:59 +00:00
Xin Li
52801d239b
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours am: 6751e0d3c8
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: Ic11de6ccfbd3caa1bfc9efc8489b588fcc9ff2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:27 +00:00
Xin Li
d77d61080c
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours am: d4d5b9ae3e
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: I0ab388c9345a1b6e3b863838bf3e4dabe81d925c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:24:48 +00:00
Automerger Merge Worker
492f9e2c50
Merge "[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours" into stage-aosp-master
2022-12-09 23:29:52 +00:00
Xin Li
6751e0d3c8
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: If55574e943f63210941bffeef146bd83413d8ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:19:25 +00:00
Xin Li
d4d5b9ae3e
[automerger skipped] Merge Android 13 QPR1 am: 3ee4291643
-s ours
...
am skip reason: Merged-In If11cebf43d42208ad628f80adb5629c173692766 with SHA-1 09e5492148
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2336241
Change-Id: Id6203c3736aa166c6c8189e55c6f7ad9e885ee8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:14:41 +00:00
Wei Wang
10c91becd8
Merge "Remove UClampThreshold hint" into tm-qpr-dev am: 8e2ec472f1
am: 178a134356
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20675389
Change-Id: I5bfb47c8b7fd6d2ab0cc1a4d12d516ec24796d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:01:26 +00:00
Wei Wang
178a134356
Merge "Remove UClampThreshold hint" into tm-qpr-dev am: 8e2ec472f1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20675389
Change-Id: Ib9a6c401fbff056e009cd048b70072efb25fcf89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 22:27:20 +00:00
Wei Wang
8e2ec472f1
Merge "Remove UClampThreshold hint" into tm-qpr-dev
2022-12-09 21:44:04 +00:00
Xin Li
3ee4291643
Merge Android 13 QPR1
...
Bug: 261731544
Merged-In: If11cebf43d42208ad628f80adb5629c173692766
Change-Id: I8a7edd3ef9fed9202f7cc1085e8dad8f28a6c481
2022-12-09 10:23:09 -08:00
John Reck
2310e8d57e
Bluejay vndk on vendor am: 09e5492148
am: da29added3
am: bd928ff399
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2333082
Change-Id: I97deda0ee56c10368a9d2ae9a7875117389025ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 20:46:28 +00:00
John Reck
bd928ff399
Bluejay vndk on vendor am: 09e5492148
am: da29added3
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2333082
Change-Id: I9a1c66f1575c52821201ed140bdfc516ebead41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 20:19:47 +00:00
John Reck
da29added3
Bluejay vndk on vendor am: 09e5492148
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2333082
Change-Id: I4337ec2f2836398f15b3283f718e4a85d8d0dfe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 19:33:01 +00:00
Steve Berbary
34b3da6eab
Update bluejay SVN to 22 am: bbab3bdc4f
am: fc2ab198d3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20668927
Change-Id: If257dab27fdb3915fd5bb037f4a3e54d86029e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 19:31:51 +00:00
Steve Berbary
fc2ab198d3
Update bluejay SVN to 22 am: bbab3bdc4f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20668927
Change-Id: I5b2a441839b58d850a2f89c8b086b0b62c362ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 19:06:00 +00:00
Chungkai Mei
47ddbad03e
Remove UClampThreshold hint
...
the file node was removed so also remove these
dummy setting
Bug: 260806701
Change-Id: I23044f7f32cf4b2b2cc93205ec5751525f05ee7f
Signed-off-by: Chungkai Mei <chungkai@google.com>
2022-12-08 09:46:28 +00:00
Cyril Lee
9578aa38c1
Enable quick start for pixel devices
...
Bug: 246218540
Test: build pass with `m -j` command
Change-Id: Iee0d60b7a416490843badc637dff9c3ba9935e2d
2022-12-08 05:20:20 +00:00
Steve Berbary
bbab3bdc4f
Update bluejay SVN to 22
...
Bug: 261738635
Change-Id: Ibe9ee074eb3ad1df5b61bf5e053a0bbdae6abbba
2022-12-07 20:59:47 +00:00
John Reck
09e5492148
Bluejay vndk on vendor
...
Bug: 261193063
Test: n/a
Change-Id: If11cebf43d42208ad628f80adb5629c173692766
2022-12-07 11:08:48 -05:00
millerliang
a49d6b9fd4
audio: add missed camcorder be_cfg in dsp latency am: 1df796b0cc
am: 41418b4df0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20647971
Change-Id: I76dda9ce8b658637daf88c2b5c48d75732caa0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 14:27:35 +00:00
millerliang
41418b4df0
audio: add missed camcorder be_cfg in dsp latency am: 1df796b0cc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20647971
Change-Id: I463d9da0f777a3804dc8117d43a2e0d8f290822d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 14:03:45 +00:00
Matt Buckley
c60aa4bab1
Disable HWUI adpf by default and enable in device.mk
...
* Make HWUI disabled by default for vendors
* Explicitly enable in supported devices
* Consolidate flags for HWUI and SF
Bug: b/261628396
Test: manual
Change-Id: Icd420ada955ef2034a23f1e591ea95948cd06072
2022-12-06 22:21:39 +00:00
millerliang
1df796b0cc
audio: add missed camcorder be_cfg in dsp latency
...
Some 3rd party app may use one or three microhpne(s)
to do the camera recording.
Add these two configurations to UC_AUDIO_RECORD to sync
the audio and video of the recoreded video.
Bug: 260824124
Test: Reporter verified
Change-Id: Iaaf160070a26926a3cf6e18a184750d154abef6d
2022-12-06 15:29:39 +08:00
Chris Paulo
042a76eaca
[automerger skipped] [DO NOT MERGE] device/vibrator: Disable adaptive haptics feature for b3 am: b1acfc42d6
am: 07e35a230d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20556067
Change-Id: I4fe3154bc370d2187b6c9a4167bc42ab54cff2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 15:45:57 +00:00
Chris Paulo
07e35a230d
[DO NOT MERGE] device/vibrator: Disable adaptive haptics feature for b3 am: b1acfc42d6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20556067
Change-Id: Idbc13fe28c3bc1be23dbb7f39257495936a625c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 15:15:37 +00:00