Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1917 commits 1 branch 0 tags 57 MiB
Commit graph

1917 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ankur Bakshi
bb98ad7456 Update shiba SVN to 12 am: 2f87d29fbe 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618000

Change-Id: I57e052998c48d76687b8973104386ee775b70e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 00:14:17 +00:00
Xin Li
51e3559f5c [automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1 -s ours am: b398916a51 -s ours 
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed is already in history

Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655

Change-Id: I544a128c147939d3ade745110bf189c374036368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:25 +00:00
Xin Li
b398916a51 [automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1 -s ours 
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed is already in history

Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655

Change-Id: Ib1368427030a68a3737fabec00f5884570de38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:36 +00:00
Ankur Bakshi
2f87d29fbe Update shiba SVN to 12 
Bug: 313797924
Change-Id: I47ff4790276c2e9dc8b4c3a211c8079d8a7d7414
 2023-12-11 20:12:22 +00:00
George Chang
2009792bbb [NFC] Update sku id for shiba am: 66faa9c03a am: e42346cb41 
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065

Change-Id: Ie1105aff9b643b9d8821036033fa823c33e0c50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 19:24:17 +00:00
Roshan Pius
46c323e195 Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918 am: 6678bbd076 
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311

Change-Id: Ie5956d248940b4c9d9dae77c4bd6721e219e15f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 19:24:07 +00:00
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
George Chang
e42346cb41 [NFC] Update sku id for shiba am: 66faa9c03a 
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065

Change-Id: I64f46eaa8e5a8b7db691f720d6c7b216b47cedc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 18:51:02 +00:00
Roshan Pius
6678bbd076 Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918 
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311

Change-Id: I38b83146e5fd603ad2104d0f8ef438c23fd2172e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 18:50:50 +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
ad5cc178e1 Merge Android 14 QPR1 
Merged-In: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
Bug: 315507370
Change-Id: Idac49a7a1c71b017efadae2ea3d58422e9b41093
 2023-12-08 13:15:54 -08: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
George Chang
66faa9c03a [NFC] Update sku id for shiba 
Bug: 314858460
Test: manual
Change-Id: Iea3260a0e8b1679db0e3a2e5cf32d3d54c904ae7
 2023-12-05 08:08:05 +00: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
0750e5b918 Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-08 21:16:20 +00:00
Roshan Pius
877024c783 Revert "shusky(nfc): Modify NFC overlays for NFC apex" 
Revert submission 25189355-nfc_overlay

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:25189355-nfc_overlay

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d92852d6470408275fb7e4072188e70ca316c27a)
Merged-In: I08a0c9967cd5da77d59ef60627b793efcf2d8377
Change-Id: I08a0c9967cd5da77d59ef60627b793efcf2d8377

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in device-husky.mk, hunk HunkHeader[427,6->427,3]: Hunk cannot be applied
Error applying patch in device-shiba.mk, hunk HunkHeader[393,6->393,3]: Hunk cannot be applied
Error applying patch in husky/overlay/packages/apps/Nfc/res/values/config.xml: Cannot perform UNIFIED action which overrides an existing file
Error applying patch in husky/rro_overlays/NfcOverlay/Android.bp: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/AndroidManifest.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/OWNERS: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/res/values/config.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/overlay/packages/apps/Nfc/res/values/config.xml: Cannot perform UNIFIED action which overrides an existing file
Error applying patch in shiba/rro_overlays/NfcOverlay/Android.bp: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/AndroidManifest.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/OWNERS: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/res/values/config.xml: Cannot perform UNIFIED action on a non-existent file

Original patch:
 From d92852d647 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 04 Nov 2023 19:00:59 +0000
Subject: [PATCH] Revert "shusky(nfc): Modify NFC overlays for NFC apex"

Revert submission 25189355-nfc_overlay

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:25189355-nfc_overlay

Bug: 309117462
Change-Id: I08a0c9967cd5da77d59ef60627b793efcf2d8377
Test: Compiles, device boots up
---
 2023-11-06 19:37:27 +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