Commit graph

3600 commits

Author SHA1 Message Date
Greg Kaiser
b4426c3690 Fix lunch choices for git_main am: 5e34e006c3
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163

Change-Id: Ie63f3466d4ccee30f2a6c08e65bf8afd31f16225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:40:15 +00:00
Greg Kaiser
e2fb70f5d0 Fix lunch choices for git_main am: 5e34e006c3 am: ba708323ef
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163

Change-Id: I4702d744ddf6dd59e99e3ef372400bbdf34a54be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:38:24 +00:00
Greg Kaiser
ba708323ef Fix lunch choices for git_main am: 5e34e006c3
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163

Change-Id: I30a25383b6e6b14ca1d9c1335adb6566f7b8f37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:11:59 +00:00
Greg Kaiser
5e34e006c3 Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0fb9be930027aa1664c9410697af4a4ec8ab5c3)
Merged-In: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
2023-10-30 22:00:49 +00:00
Android Build Coastguard Worker
59580c5df3 Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176368', 'googleplex-android-review.googlesource.com/25176369', 'googleplex-android-review.googlesource.com/25063889', 'googleplex-android-review.googlesource.com/25176739', 'googleplex-android-review.googlesource.com/25181893'] into udc-qpr1-release.
Change-Id: I9eba05c4cfe798896db3b4f91599ac3975987ed0
2023-10-27 03:36:12 +00:00
Ankur Bakshi
4d4bede613 Update panther SVN to 37
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1eee239bb39277c5afb0074a30c20244bf68692)
Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
2023-10-27 03:33:08 +00:00
Ankur Bakshi
19c3062b80 Update cheetah SVN to 37
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9205873929d4f1afe7a09c4f322fa7bbeb18fd98)
Merged-In: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
2023-10-27 03:33:00 +00:00
Shivakumar Neginal
cd89e65ff3 Adding Fast Pair extended IDs for Pixel 7
Adding the Fast Pair extended IDs for Pixel 7 so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.

Bug: 305516133
Test: Manually flashed a cheetha and panther device and validated the FP
      bottom sheet is displayed on a nearby other device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec518897c23085d558af3971154bdf09ab8256c5)
Merged-In: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
2023-10-27 03:32:52 +00:00
Lokesh Kumar Goel
b851e4ef98 Update panther SVN to 36
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:59025a6c836b8eae7ec6e2f59da3f920c4e13033)
Merged-In: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
2023-10-27 03:32:44 +00:00
Lokesh Kumar Goel
779fc5b702 Update cheetah SVN to 36
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92a618d04ff92d8410f7d035236bac7fe5c3d537)
Merged-In: I639d80c0b9f299cffef48fb7719cfbacc776ba45
Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45
2023-10-27 03:32:36 +00:00
Ankur Bakshi
eef3c350f0 Update panther SVN to 37 am: a1eee239bb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25181893

Change-Id: Ia26a32b184016c3a644f660fea76d13e55002e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:37 +00:00
Ankur Bakshi
fe9d857f70 Update cheetah SVN to 37 am: 9205873929
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176739

Change-Id: Iad6fd94e952f6e08ec112c06fc3db9ec4e88fd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:21 +00:00
Ankur Bakshi
a1eee239bb Update panther SVN to 37
Bug: 302612466
Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
2023-10-27 02:06:01 +00:00
Ankur Bakshi
9205873929 Update cheetah SVN to 37
Bug: 302612466
Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6
2023-10-27 02:02:42 +00:00
Shivakumar Neginal
0f79fb5c55 Adding Fast Pair extended IDs for Pixel 7 am: ec518897c2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25063889

Change-Id: I42a69808ffc8857f3b3b07cd589bc911f382608a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:22:20 +00:00
Shivakumar Neginal
ec518897c2 Adding Fast Pair extended IDs for Pixel 7
Adding the Fast Pair extended IDs for Pixel 7 so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.

Bug: 305516133
Test: Manually flashed a cheetha and panther device and validated the FP
      bottom sheet is displayed on a nearby other device
Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
3b1d29c929 Update panther SVN to 36 am: 59025a6c83 am: 82580c644d am: 0ef04a6f95
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369

Change-Id: I645b4fcb6692c67aedafb74070c9bb3e2ec5dcb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:37 +00:00
Lokesh Kumar Goel
ac656e3334 Update cheetah SVN to 36 am: 92a618d04f am: fbab23735f am: 1375935ffd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368

Change-Id: Ia9c5c292626c325b387ca9e5e8c37bf52b18a15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:30 +00:00
Lokesh Kumar Goel
ebff7bb2fb [automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a am: f9b2824191 -s ours am: 80a786f706 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Id9a86f41c9997a4e7d97440c646103d68e0ae202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:05 +00:00
Lokesh Kumar Goel
48e5158686 [automerger skipped] Update panther SVN to 35 am: 2a2884b47c am: 03f3449968 -s ours am: 353714f18e -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Iab408c2fcb4d8c812de551be8f7cfbbd2ea558eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:58 +00:00
Lokesh Kumar Goel
be9dcfd752 Update panther SVN to 36 am: 59025a6c83 am: 2ef063fea3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369

Change-Id: Iadbb9457efe2fc59119cca85ff6c9d032802a5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:22 +00:00
Lokesh Kumar Goel
8702b3bbea Update cheetah SVN to 36 am: 92a618d04f am: 8de7f8b190
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368

Change-Id: I558e6902f51dfac85a35e9b11aaad77697ac9bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:15 +00:00
Lokesh Kumar Goel
0e4f5d2d5c [automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a am: 9ebeab8dbf -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I367b34f6189d323dfdec3250300508399c51a33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:43 +00:00
Lokesh Kumar Goel
c89c6d858e [automerger skipped] Update panther SVN to 35 am: 2a2884b47c am: 10b98107de -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I94c94513e4e67fc5f89431d9650e606858d68c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:36 +00:00
Lokesh Kumar Goel
0ef04a6f95 Update panther SVN to 36 am: 59025a6c83 am: 82580c644d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369

Change-Id: I46232df6bd94b2702052179103d44fac53b60111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:45 +00:00
Lokesh Kumar Goel
1375935ffd Update cheetah SVN to 36 am: 92a618d04f am: fbab23735f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368

Change-Id: Ie204a353d591fcff5232c13c14c9130ed1114c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
80a786f706 [automerger skipped] Update cheetah SVN to 35 am: 7e02c7f28a am: f9b2824191 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I62e57c1039e9d992f2a5292fde586bc870d9d877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:09 +00:00
Lokesh Kumar Goel
353714f18e [automerger skipped] Update panther SVN to 35 am: 2a2884b47c am: 03f3449968 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Ifb6cd042ad1323872b12c1fcc70becc0812d5fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:01 +00:00
Lokesh Kumar Goel
82580c644d Update panther SVN to 36 am: 59025a6c83
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369

Change-Id: If13f26512dc539bb174bd13336dad4f641625531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:27 +00:00
Lokesh Kumar Goel
fbab23735f Update cheetah SVN to 36 am: 92a618d04f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368

Change-Id: I3ae528ea4c13b040535ee59b42b0a115efad3337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:23 +00:00
Lokesh Kumar Goel
f9b2824191 Update cheetah SVN to 35 am: 7e02c7f28a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439

Change-Id: Idc2ffa8e0bfb22a8803d778afc9ea73a39f026ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:03 +00:00
Lokesh Kumar Goel
03f3449968 Update panther SVN to 35 am: 2a2884b47c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438

Change-Id: I95504310275c226fde1aa443c9d9584b6e03d555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:05:57 +00:00
Lokesh Kumar Goel
2ef063fea3 Update panther SVN to 36 am: 59025a6c83
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176369

Change-Id: Ifa0ea0e95a76e63f0190ca8e4dd8b46ab6b0c03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:59 +00:00
Lokesh Kumar Goel
8de7f8b190 Update cheetah SVN to 36 am: 92a618d04f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25176368

Change-Id: I1ae9880d5e49d4b28946e7b0af49be40c0ae5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:53 +00:00
Lokesh Kumar Goel
9ebeab8dbf Update cheetah SVN to 35 am: 7e02c7f28a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175439

Change-Id: I3ac45a680e210301458cc6b995dad5a119052baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:33 +00:00
Lokesh Kumar Goel
10b98107de Update panther SVN to 35 am: 2a2884b47c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25175438

Change-Id: I7b8f7a4a0b6e30bdb821dbc56cd6cbeb815282bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
0c783007b6 pantah(nfc): Modify NFC overlays for NFC apex am: 3b1c277470 am: 8acbe79e14
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2804494

Change-Id: Icd0956a2561bfce2359ab0b4aeb570300e3024b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:37 +00:00
Roshan Pius
329f26f9b4 pantah(nfc): Modify NFC overlays for NFC apex am: 3b1c277470 am: 095ecef0c7
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2804494

Change-Id: I4f0a00608a721c41f02ac9f3bae296f50ea84107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:10 +00:00
Roshan Pius
8acbe79e14 pantah(nfc): Modify NFC overlays for NFC apex am: 3b1c277470
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2804494

Change-Id: Ic2d29705b2fa5dae728eccec3dffae999f3f04a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:53 +00:00
Roshan Pius
095ecef0c7 pantah(nfc): Modify NFC overlays for NFC apex am: 3b1c277470
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2804494

Change-Id: Iaba6a784718844093646ba76a8a07fdd1cd31d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:58 +00:00
Roshan Pius
3b1c277470 pantah(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ib3098898eaffb0c86ab082814aa6fe288a37a30f
2023-10-25 14:27:25 -07:00
Lokesh Kumar Goel
894c43649b Update panther SVN to 36 am: 94bff2832a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24896510

Change-Id: Ib36b6f47039eb7354f4aec6a5e31ce43f34b0942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:17 +00:00
Lokesh Kumar Goel
3013992026 Update cheetah SVN to 36 am: 2ff44800eb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/24896513

Change-Id: Ifceb97cee36ef5554d24abb4aa07a71a047ab0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:41:06 +00:00
Lokesh Kumar Goel
59025a6c83 Update panther SVN to 36
Bug: 302612466
Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
2023-10-25 20:25:31 +00:00
Lokesh Kumar Goel
92a618d04f Update cheetah SVN to 36
Bug: 302612466
Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45
2023-10-25 20:25:31 +00:00
Lokesh Kumar Goel
7e02c7f28a Update cheetah SVN to 35
Bug: 302612466
Change-Id: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9
(cherry picked from commit a6e9460ef2)
2023-10-25 20:25:09 +00:00
Lokesh Kumar Goel
2a2884b47c Update panther SVN to 35
Bug: 302612466
Change-Id: I8d176a2ba9ddef34449edae5df6fdfd55d346c51
2023-10-25 19:47:19 +00:00
Lokesh Kumar Goel
94bff2832a Update panther SVN to 36
Bug: 302612466
Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e
2023-10-25 19:40:56 +00:00
Lokesh Kumar Goel
2ff44800eb Update cheetah SVN to 36
Bug: 302612466
Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45
2023-10-25 17:10:11 +00:00
Xin Li
3a4b764795 [automerger skipped] Merge 10952656 am: bcedce774c -s ours
am skip reason: Merged-In I27abe7f4b532bee7182201e4ef020745309db944 with SHA-1 46c80b8257 is already in history

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

Change-Id: I6d335a028f70668758f01b666e92fa36f955a094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:47:54 +00:00