Roshan Pius
0f9924bb74
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours am: fb1f42b7c8
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: Ie4855967d3fd5c04e64b383e70121843bcba6652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:04 +00:00
Roshan Pius
fb1f42b7c8
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: I1cad326d9fd0a654a30a9fea67e12602bc443e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:47 +00:00
Xin Li
dc1e99d2e4
[automerger skipped] Merge UQ1A.231205.015 am: e2d2ed85ed
-s ours
...
am skip reason: Merged-In I38bce6825ac29b93a6691cee6cca312be3db874e with SHA-1 6f2da6ead2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25590376
Change-Id: I3b70dcb945156c63809469fecb1ae7f3aeae3bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
e2d2ed85ed
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
2023-12-07 15:47:37 -08:00
Ankur Bakshi
47ada33332
Merge changes from topic "svn-feb-24" into udc-qpr-dev am: 876909d9d4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25498860
Change-Id: I660c3f4e34a0efb8f3dcde07eda384413a1d6865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:24 +00:00
Ankur Bakshi
c09886eb27
Update husky SVN to 10 am: 8310d49d51
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25499493
Change-Id: I00067c1966dd3d6447d3ca749a1149737b915fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:13 +00:00
Ankur Bakshi
f631d86540
Update shiba SVN to 11 am: 50247665a0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496612
Change-Id: Ic74b4ce8615fdffbd4c37891d9cd2c7b68d8b83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:04 +00:00
Ankur Bakshi
77bd2526f3
Update shiba SVN to 10 am: db101e499a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25496611
Change-Id: I7af7a812356fd61dadd264daa2a3dbc447e6fc05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:34:59 +00:00
Ankur Bakshi
876909d9d4
Merge changes from topic "svn-feb-24" into udc-qpr-dev
...
* changes:
Update husky SVN to 11
Update husky SVN to 10
2023-11-29 22:08:38 +00:00
Ankur Bakshi
b6c489280c
Update husky SVN to 11
...
Bug: 313696499
Change-Id: I0bb0b7914c3dcb9f63682be1f8005384ed61328e
2023-11-29 06:51:24 +00:00
Ankur Bakshi
8310d49d51
Update husky SVN to 10
...
Bug: 313696499
Change-Id: I7b6bd17cccd6fb31177b8ecdf72ab6096373f6b0
2023-11-29 06:48:39 +00:00
Ankur Bakshi
50247665a0
Update shiba SVN to 11
...
Bug: 313696499
Change-Id: I8da0fcaf9e1d6e9cd6d4768f3628b43a62163688
2023-11-29 06:47:34 +00:00
Ankur Bakshi
db101e499a
Update shiba SVN to 10
...
Bug: 313696499
Change-Id: Id343a68986f11b2348343666d537d73939f17516
2023-11-29 06:42:47 +00:00
Treehugger Robot
817ae97beb
Merge "Revert "Enable Bluetooth CHRE feature on bt_vendor.conf"" into udc-qpr-dev am: b837e87068
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25482396
Change-Id: Ie4a6d604d6f81e5fed78e74f480ad833c245a30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 03:55:13 +00:00
Treehugger Robot
b837e87068
Merge "Revert "Enable Bluetooth CHRE feature on bt_vendor.conf"" into udc-qpr-dev
2023-11-29 03:17:06 +00:00
Weichin Weng
e211cf7913
Revert "Enable Bluetooth CHRE feature on bt_vendor.conf"
...
This reverts commit dbc0ad4d25
.
Reason for revert: Revert by request b/298141323#comment32
Bug: 298141323
Change-Id: I12e3fabd29fd482b4658db9b875db20d05d62086
2023-11-29 01:30:53 +00:00
Ankur Bakshi
f8088d0ea2
Merge "Update shiba SVN to 9" into udc-qpr-dev am: 95bc3625fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25344360
Change-Id: Id140b2e299f9174d5b6411c11b4ab20c842ac8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:20 +00:00
Ankur Bakshi
695bd86068
Merge "Update husky SVN to 9" into udc-qpr-dev am: 46f1623c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25341851
Change-Id: I67dc5b4da78f99c8aa5e4ef47d2ffeafe38b1c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Ankur Bakshi
95bc3625fe
Merge "Update shiba SVN to 9" into udc-qpr-dev
2023-11-16 20:42:28 +00:00
Ankur Bakshi
46f1623c6b
Merge "Update husky SVN to 9" into udc-qpr-dev
2023-11-16 20:42:28 +00:00
Becker (Chan-Ying) Lien
b4dc9e40f1
Update ShannonIms CERTIFICATE to PRESIGNED for Husky
...
Bug: 311289519
Change-Id: I32f1a7f4f08ee3e02883256f26299a00e538f4af
2023-11-16 17:53:37 +00:00
Becker (Chan-Ying) Lien
ea7a1b571d
Update ShannonIms CERTIFICATE to PRESIGNED for Shiba
...
Bug: 311289519
Change-Id: I2f2cf0e703a77bd04e8d44a11d767babcc1d94ee
2023-11-16 17:52:36 +00:00
Ankur Bakshi
a4d4531e86
Merge "Update husky SVN to 8" into udc-qpr-dev am: 13d7e9588c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25344098
Change-Id: Ia7200706a4ad8177cb75d8469fcfe29f4610f555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:03 +00:00
Ankur Bakshi
333abd6b10
Merge "Update shiba SVN to 8" into udc-qpr-dev am: 8a9a417b43
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25343401
Change-Id: Ieb52df0754b759c84cd2a036fc05e39c86eae7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:28:59 +00:00
Ankur Bakshi
13d7e9588c
Merge "Update husky SVN to 8" into udc-qpr-dev
2023-11-16 03:41:46 +00:00
Ankur Bakshi
8a9a417b43
Merge "Update shiba SVN to 8" into udc-qpr-dev
2023-11-16 03:41:46 +00:00
Ankur Bakshi
b1962b4339
Update husky SVN to 9
...
Bug: 309529736
Change-Id: Idf6bcb27b9f72f4eecbdf313372268ab18053865
2023-11-11 03:08:01 +00:00
Ankur Bakshi
3e95ecd2dd
Update husky SVN to 8
...
Bug: 309529736
Change-Id: I025214556cc8e6f9b4bd61dbc1854bff207b4016
2023-11-11 03:05:42 +00:00
Ankur Bakshi
acdb02e9aa
Update shiba SVN to 9
...
Bug: 309529736
Change-Id: I737a6cbdbbf372c64168019a7f085f3b531d252e
2023-11-11 02:58:34 +00:00
Ankur Bakshi
94530707be
Update shiba SVN to 8
...
Bug: 309529736
Change-Id: I52cf74012b91a31315c24c8c3a67e5744f8ca3be
2023-11-11 02:35:15 +00:00
Treehugger Robot
ec74a7d4a9
Merge "Update husky SVN to 7" into udc-qpr-dev am: 2cfb63dd59
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25293134
Change-Id: I0f09e6ba9f9978cc9f09d412b6b88533a37edbaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:05 +00:00
Ankur Bakshi
4b6d0ff028
Update shiba SVN to 7 am: 3a07bc2498
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25292604
Change-Id: I7645c738f6ffee52eff6f5fa3a188bccba6b0065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:02 +00:00
Treehugger Robot
2cfb63dd59
Merge "Update husky SVN to 7" into udc-qpr-dev
2023-11-11 00:56:33 +00:00
Ankur Bakshi
baac78e02b
Update husky SVN to 7
...
Bug: 302612466
Change-Id: Ia41e0f55fe84257d91f99322b013024efea970ec
2023-11-10 23:16:35 +00:00
Ankur Bakshi
3a07bc2498
Update shiba SVN to 7
...
Bug: 302612466
Change-Id: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0
2023-11-10 23:16:03 +00:00
Roshan Pius
9371a0a341
Revert "shusky: Replace NFC app with NFC apex" am: 9a64e8e194
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25320511
Change-Id: Icf01ecf461d66893abd887e3aa5034b95d5e80b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 06:25:23 +00:00
Roshan Pius
9a64e8e194
Revert "shusky: Replace NFC app with NFC apex"
...
This reverts commit 20a2f7b30c
.
Reason for revert: Needed for revert topic: https://android-review.git.corp.google.com/q/topic:%22nfc_apex_revert%22
Bug: 309867188
Test: None
Merged-In: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Change-Id: Id037ef8567ac6d0fd6fd15f6c625758b41181161
2023-11-09 04:17:26 +00:00
Roshan Pius
18ec58ff4d
Revert "shusky: Replace NFC app with NFC apex"
...
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4454d4b92ac97fe91792387de75783dbca2d96d5 )
Merged-In: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Change-Id: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in device-husky.mk, hunk HunkHeader[87,7->87,7]: Hunk cannot be applied
Error applying patch in device-ripcurrent.mk, hunk HunkHeader[71,7->71,7]: Hunk cannot be applied
Error applying patch in device-shiba.mk, hunk HunkHeader[70,7->70,7]: Hunk cannot be applied
Original patch:
From 4454d4b92a
Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 04 Nov 2023 14:58:26 +0000
Subject: [PATCH] Revert "shusky: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Change-Id: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Test: Compiles, device boots up
---
2023-11-06 19:37:15 +00:00
Android Build Coastguard Worker
4458f0bf68
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25241713'] into udc-qpr1-release.
...
Change-Id: Ifd37a56f1cb79098f2c1fe370451f11966400a7f
2023-11-02 20:26:31 +00:00
Wayne Lin
ccea197344
gps: set high accuracy shape mode to 1
...
Only support CP LPP HA GAD shape for TMO
Bug: 308489551
Test: CP LPP pass in carrier LAB
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f2da6ead27e3ea2a8cbee2c5deb942c05141474 )
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I38bce6825ac29b93a6691cee6cca312be3db874e
2023-11-02 20:25:41 +00:00
Wayne Lin
115303a1f1
gps: set high accuracy shape mode to 1 am: 6f2da6ead2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25241713
Change-Id: Ib9343b67bd505ab93ed98bd1f57783020fc84eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:44:12 +00:00
Wayne Lin
6f2da6ead2
gps: set high accuracy shape mode to 1
...
Only support CP LPP HA GAD shape for TMO
Bug: 308489551
Test: CP LPP pass in carrier LAB
Change-Id: I38bce6825ac29b93a6691cee6cca312be3db874e
2023-11-02 00:59:56 +00:00
Android Build Coastguard Worker
f84e36b6e1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25010336', 'googleplex-android-review.googlesource.com/25007722'] into udc-qpr1-release.
...
Change-Id: Ie0576b884f35bd44748041b3e89a28117eaaf8f2
2023-10-27 03:36:17 +00:00
Ankur Bakshi
d667847313
Update husky SVN to 6
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e27f637a4edd6fd99a21162ecce847106fecc47 )
Merged-In: Id8f52d6abb4c83ff3d862347c3100a18b5806d45
Change-Id: Id8f52d6abb4c83ff3d862347c3100a18b5806d45
2023-10-27 03:34:02 +00:00
Ankur Bakshi
5c500cb5b0
Update shiba SVN to 6
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9e15f1bfcd2059140f81aa5e40440db98aab53e )
Merged-In: Id531d288fc06bf7c488799287f5d93dae77bc1f3
Change-Id: Id531d288fc06bf7c488799287f5d93dae77bc1f3
2023-10-27 03:33:53 +00:00
Alex Hong
9cccdb9e2b
[automerger skipped] Jump SVN to 5 am: 7d60b2a6bc
-s ours am: 928ed99aab
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25170842
Change-Id: I087305d735263259aa282e8890dd252048ee48e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 01:18:43 +00:00
Alex Hong
928ed99aab
[automerger skipped] Jump SVN to 5 am: 7d60b2a6bc
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25170842
Change-Id: I9892060c219bea2dff9d26554a433fec26894adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 00:46:22 +00:00
Lokesh Kumar Goel
6cbf76d4f2
Merge "Update husky SVN to 6" into udc-qpr-dev am: 0ea0cdcd3e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25007722
Change-Id: Ic804df88d4f98a82b2ad7fd56b4adda174320867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:10 +00:00
Lokesh Kumar Goel
1a23eb9c77
Merge "Update shiba SVN to 6" into udc-qpr-dev am: e29162279c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25010336
Change-Id: I8be98fbb18f904d63b46e09fe3285bb8f18d22dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:40:59 +00:00
Lokesh Kumar Goel
0ea0cdcd3e
Merge "Update husky SVN to 6" into udc-qpr-dev
2023-10-25 19:59:16 +00:00