Commit graph

1205 commits

Author SHA1 Message Date
Steve Berbary
b6cfbd18b7 Update bluejay SVN to 26 am: d0ff062816
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21359647

Change-Id: Icbbe842a42eb43bed965562d5e6561bf37da4149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 06:07:37 +00:00
Steve Berbary
d0ff062816 Update bluejay SVN to 26
Bug: 268558932
Change-Id: I19380198fcb5b0b3d7bc375fd427d122b133eeb9
2023-02-10 03:12:52 +00:00
Xin Li
dda4b85202 [automerger skipped] Merge TQ1A.230205.002 am: 5e0e300375 -s ours am: ad2c89864a -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2423572

Change-Id: I9fd56d9e9a3cf565f194f4a97d746e60f2e75466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:45:26 +00:00
Xin Li
ad2c89864a [automerger skipped] Merge TQ1A.230205.002 am: 5e0e300375 -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2423572

Change-Id: Ia71b3c81ddd2b162c457ada7999f0c7ba2fcda0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:13:29 +00:00
Xin Li
5e0e300375 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
Change-Id: I75d8b6e1c8c93acf28b0d2002923da3b6af7bbcf
2023-02-06 21:02:14 -08:00
Android Build Coastguard Worker
33962f6589 Merge cherrypicks of ['ag/20984588'] into tm-qpr2-release.
Change-Id: I9e449f8ebccbe6e372e46a238f581cd9c2d599f6
2023-01-17 20:19:18 +00:00
Steve Berbary
a6412bbb2a Update bluejay SVN to 25
Bug: 265319238
Change-Id: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
(cherry picked from commit 17f995666a)
Merged-In: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
2023-01-17 20:05:14 +00:00
Steve Berbary
f23883e255 Update bluejay SVN to 25 am: 17f995666a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20984588

Change-Id: I702375513e043e185852f509a2a75373050f74dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 21:20:27 +00:00
Steve Berbary
17f995666a Update bluejay SVN to 25
Bug: 265319238
Change-Id: If127a2710c6a3c685987bbc4a1c1b6e619ff781c
2023-01-13 18:46:22 +00:00
Xin Li
4de548a735 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 017f868349 -s ours
am skip reason: Merged-In I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2 with SHA-1 79dd1bc1fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20947158

Change-Id: I716148210d5029d3f455c74d8c5cfc67159cc0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:08:18 +00:00
Xin Li
017f868349 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
Change-Id: I0a52311665712fce6c8c244585807ceb66891121
2023-01-11 22:46:08 -08:00
Android Build Coastguard Worker
318f30c4d5 Snap for 9463735 from 79dd1bc1fc to tm-qpr2-release
Change-Id: I3fe1149dee8273878f7789d1b9d3bf62b526f919
2023-01-07 02:02:12 +00:00
Steve Berbary
f60c6a0d30 Update bluejay SVN to 24 am: 79dd1bc1fc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20885441

Change-Id: I7a121c02ac99bb7085a4cff56e53568c11e9facd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:55:19 +00:00
Bill Yi
b9b4692b7c [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 86ea6114f9 -s ours am: 20b6b996c2 -s ours
am skip reason: Merged-In I41f7a395539ac2ce3b08899b27cdc5d6031b175c with SHA-1 83af9bbb96 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2377815

Change-Id: Ice793d9b244ca57cc4934806750c4d391df974c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:26:06 +00:00
Bill Yi
20b6b996c2 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 86ea6114f9 -s ours
am skip reason: Merged-In I41f7a395539ac2ce3b08899b27cdc5d6031b175c with SHA-1 83af9bbb96 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2377815

Change-Id: I4518396122e5e9ec739915e6e3f3a38ad399c28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:00:05 +00:00
Android Build Coastguard Worker
805b356c6e [coastguard skipped] Merge sparse cherrypicks from sparse-9402666-L12400000958024923 into tm-qpr1-release.
COASTGUARD_SKIP: Ifd904339115712c72786aafd1d32b57a007e550b
COASTGUARD_SKIP: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
COASTGUARD_SKIP: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2

Change-Id: Ib03a147703a9851b3e6721403fcebdfee66017f4
2023-01-06 18:12:39 +00:00
Android Build Coastguard Worker
cf644e18e4 Merge cherrypicks of ['ag/20806563', 'ag/20885441'] into sparse-9402666-L12400000958024923.
SPARSE_CHANGE: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
SPARSE_CHANGE: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2

Change-Id: Ifd904339115712c72786aafd1d32b57a007e550b
2023-01-06 18:06:18 +00:00
Steve Berbary
4c38ea5e1b Update bluejay SVN to 24
Bug: 261738635
Change-Id: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
(cherry picked from commit 79dd1bc1fc)
Merged-In: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
2023-01-06 18:05:18 +00:00
Paul Scovanner
1f9bf5f0a6 Update bluejay SVN to 23
Bug: 258811679
Change-Id: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
(cherry picked from commit 36730c7be2)
Merged-In: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
2023-01-06 18:05:14 +00:00
Bill Yi
86ea6114f9 Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: I41f7a395539ac2ce3b08899b27cdc5d6031b175c
Merged-In: Ib4a07c7ce4e4be2844cc2f4a97094e73a517c7a4

Change-Id: Icd00f57019b2025216d6ee8b4529e42f44fd987d
2023-01-06 15:35:11 +00:00
Bill Yi
611dee5536 [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: 83af9bbb96 -s ours
am skip reason: Merged-In Ib4a07c7ce4e4be2844cc2f4a97094e73a517c7a4 with SHA-1 dcb556126f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20874998

Change-Id: Ic5db220ce51fe241d9a00b4ce730120026c38416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 07:32:56 +00:00
Steve Berbary
79dd1bc1fc Update bluejay SVN to 24
Bug: 261738635
Change-Id: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2
2023-01-05 21:30:24 +00:00
Bill Yi
83af9bbb96 Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: Ib4a07c7ce4e4be2844cc2f4a97094e73a517c7a4
Change-Id: I41f7a395539ac2ce3b08899b27cdc5d6031b175c
2023-01-04 11:21:43 -08:00
Android Build Coastguard Worker
1b22fb191d Snap for 9446458 from a1e02997c8 to tm-qpr2-release
Change-Id: Ie62b059b8b24fec71eda84d2fd8dab5ca1bdbce0
2022-12-31 02:02:09 +00:00
Edwin Tung
dcb556126f gps: Enable Vzw SUPL OTDOA am: a1e02997c8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/20832181

Change-Id: Ib4a07c7ce4e4be2844cc2f4a97094e73a517c7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-30 11:53:51 +00:00
Android Build Coastguard Worker
845e48c550 Snap for 9444344 from 667c6a7b46 to tm-qpr2-release
Change-Id: I54176708da56dd76e93f4bdc887f68f3b29eef79
2022-12-30 00:02:11 +00:00
Edwin Tung
a1e02997c8 gps: Enable Vzw SUPL OTDOA
Bug: 263852801
Test: OTDOA pass
Change-Id: Ia4e60851f212972ddebc5774c22c1eb7233fffbe
2022-12-29 13:15:41 +08: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
Android Build Coastguard Worker
2ec8fb945f Snap for 9434600 from 36730c7be2 to tm-qpr2-release
Change-Id: I1a60bf0bdbb1b394c850dd343575fc44068682ec
2022-12-24 02:02:06 +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
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
Android Build Coastguard Worker
1bd67d2d03 Snap for 9390188 from 8e2ec472f1 to tm-qpr2-release
Change-Id: I34b57d9f11c0dadde455be83fb4b417ac1f59fce
2022-12-10 02:02:19 +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