Commit Graph

2547 Commits

Author SHA1 Message Date
George Chang
eaad44d7dc [NFC] Add antenna position coordinates
Bug: 272406680
Test: manual
Change-Id: Ic1b0573d51cf56bfd10147efc2b9713aec258116
2023-03-09 06:30:17 +00:00
Presubmit Automerger Backend
03c8bba67e [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours am: 0deb4dae92 -s ours am: f2a0397f67 -s ours am: 753f5dfc8b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64c36016452e3fa57e61a80611d9b7f5370654d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 04:41:44 +00:00
Presubmit Automerger Backend
753f5dfc8b [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours am: 0deb4dae92 -s ours am: f2a0397f67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If024bafe4962e1f6d266c920dca6e1122e6a8199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 02:02:53 +00:00
Presubmit Automerger Backend
f2a0397f67 [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours am: 0deb4dae92 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If84369f5ea7f1aa60afccb0b28ca3fa72dd109c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:30:17 +00:00
Presubmit Automerger Backend
d72c6e2706 [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours am: eceda74f8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e53a146ac641980a68b9a811f6e77849dd3c4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:26:35 +00:00
Presubmit Automerger Backend
0deb4dae92 [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d1339c2cfd3e953703f894ce0b8363bcd749d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:53:32 +00:00
Presubmit Automerger Backend
eceda74f8f [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd2324b1c38952652f6a04a1c0fd24f677786a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:52:46 +00:00
Presubmit Automerger Backend
905a5e21ce [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I005fb6654ff69b3492cf3a95dadfa75129544106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:13:56 +00:00
Presubmit Automerger Backend
f0aaa0768c [automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61ee2fb1ea5c5d87c1b073333bf6c771775da854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:41:33 +00:00
Presubmit Automerger Backend
358462dab3 [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/21609528

Change-Id: I6c5f2cfcfdfa5ff5b864bdcd200f78431807fa0d
2023-02-27 23:06:30 +00:00
Brian Egizi
8a352cd0e9 [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d
Bug: b/270729982
Change-Id: I2f912755bab84e8ae431347f08c215e6b5ef2351
2023-02-27 23:03:48 +00:00
George
91aefea853 [NFC] Set tag_intent_app_pref_supported
Bug: 244272155
Test: atest android.permission.cts.NfcPermissionTest
Test: atest NfcFeatureFlagTest
Change-Id: Icaa8caacc4a351016b75eb09dd0926e2e385dd60
2023-02-01 17:50:31 +08:00
Ken Yang
b75d5d4992 WLC: Add device specific wireless_charger files
Cleanup the sysfs_wlc and add the latest wireless_charger HAL
as device specificed implementation to keep the compatibility

Bug: 264624634
Bug: 263830018
Change-Id: I0b4a0c3f57ce85ebc700e46deadc938ad74602b4
Signed-off-by: Ken Yang <yangken@google.com>
2023-01-13 04:41:29 +00:00
Ken Yang
5751874a5e Merge "WLC: Include the wireless_charger from gs-common" 2022-12-21 08:36:15 +00:00
Automerger Merge Worker
c644d394af Merge "[automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours" into stage-aosp-master am: 07ade5ae2b -s ours am: ac0bcce42b -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I3dfa3060b0f3b5264e2c7524150a254885b86021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:50:50 +00:00
Xin Li
133f9c20aa [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours am: ee98c80133 -s ours am: 531e0382e5 -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I0fa1e851f66ece65fa8bc3fb903c6f6b33c04df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:48:03 +00:00
Xin Li
f8fedd94e6 [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours am: 53c1e3d32a -s ours am: b70ad8cebe -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: Ic4cd1215181686d8808aba87bf115707a8f39a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 11:57:10 +00:00
Ken Yang
c0131d99d5 WLC: Include the wireless_charger from gs-common
Bug: 237600973
Change-Id: I63fe189c6e41b916f496845d9ea9bab87ca703e7
Signed-off-by: Ken Yang <yangken@google.com>
2022-12-10 14:06:48 +00:00
Automerger Merge Worker
ac0bcce42b Merge "[automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours" into stage-aosp-master am: 07ade5ae2b -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I1076e3b527e15967752eaa9367cbc11e1566f1b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:00:22 +00:00
Xin Li
531e0382e5 [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours am: ee98c80133 -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I386083390bcab319575c002a5d8dbe022940535f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:36 +00:00
Xin Li
b70ad8cebe [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours am: 53c1e3d32a -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I40c6815ff3a67af65bc3869790e9606fedbfb6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:24:57 +00:00
Automerger Merge Worker
07ade5ae2b Merge "[automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours" into stage-aosp-master 2022-12-09 23:29:55 +00:00
Xin Li
ee98c80133 [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: I3d5d7b16669cdc55b3ff3eb77bedcfb08fcbe38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:19:35 +00:00
Xin Li
53c1e3d32a [automerger skipped] Merge Android 13 QPR1 am: d605f0d650 -s ours
am skip reason: Merged-In I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 with SHA-1 f180675fc4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2338119

Change-Id: If0dbd4eb832c5841f10e15f75ae712ceeec23b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:14:51 +00:00
Xin Li
d605f0d650 Merge Android 13 QPR1
Bug: 261731544
Merged-In: I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392
Change-Id: I7c7755a580eccebe4a59f013d5e65b72c07ec3fc
2022-12-09 10:28:14 -08:00
Greg Kaiser
abf4af8eb0 Merge "Revert "Update Redfin compatibility matrix to use the"" 2022-12-02 16:14:11 +00:00
Gabriel Biren
e97e349073 Revert "Update Redfin compatibility matrix to use the"
This reverts commit 5f06ae8d25.

Reason for revert: Blocking Wembley team

Change-Id: I25338eded93b9009090a5b9b22c09af52c934f57
2022-12-01 22:27:42 +00:00
Shawn Lin
cb4f484d5c Merge "Add display shape config for redfin" 2022-12-01 07:34:43 +00:00
Gabriel Biren
08dd286c18 Merge "Update Redfin compatibility matrix to use the AIDL wifi_ext service." 2022-11-30 22:47:24 +00:00
Krzysztof Kosiński
8ac6fef474 Add prebuilt protobuf 3.9.1 to vendor partition. am: f180675fc4 am: 887e475c8c am: c9571c71c1
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2299060

Change-Id: Ia3ef0f0f1663dadca79884da6bfbc332434445a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 07:32:41 +00:00
Krzysztof Kosiński
c9571c71c1 Add prebuilt protobuf 3.9.1 to vendor partition. am: f180675fc4 am: 887e475c8c
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2299060

Change-Id: I68ab9eddb7bd8b1f51bf796f37805f7ee2cf5ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 07:00:50 +00:00
Krzysztof Kosiński
887e475c8c Add prebuilt protobuf 3.9.1 to vendor partition. am: f180675fc4
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2299060

Change-Id: I22f152496d6e2a5ac937ff64d9a9b23c45d35659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 06:33:59 +00:00
Krzysztof Kosiński
f180675fc4 Add prebuilt protobuf 3.9.1 to vendor partition.
Needed to work around a Qualcomm HAL prebuilt.

Bug: 203713560
Bug: 258322017
Bug: 258589373
Bug: 258632688
Test: Forrest
Change-Id: I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392
2022-11-11 00:25:27 +00:00
Gabriel Biren
5f06ae8d25 Update Redfin compatibility matrix to use the
AIDL wifi_ext service.

Bug: 205044134
Test: Presubmit tests
Change-Id: I263e094cda4ccd78f07d3082e26caf8a7ef93d63
2022-10-28 18:52:47 +00:00
Xin Li
ddab15ed0b [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 92ef02b385 -s ours am: 4e29f2496c -s ours
am skip reason: Merged-In I520e381950ddb0b7bce52ca38a4fd27e4cf0683c with SHA-1 caa2a07303 is already in history

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

Change-Id: I257122c0587c24ebdbb575e80455d04402d1dffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:10:03 +00:00
Xin Li
4e29f2496c [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 92ef02b385 -s ours
am skip reason: Merged-In I520e381950ddb0b7bce52ca38a4fd27e4cf0683c with SHA-1 caa2a07303 is already in history

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

Change-Id: I63a0be8ab475329460fd48aca3f87702c71462f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:56:05 +00:00
Xin Li
92ef02b385 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I520e381950ddb0b7bce52ca38a4fd27e4cf0683c
Change-Id: I8979d50160ea09b386bec2ad248ee13f856dccd8
2022-10-06 12:01:22 -07:00
Shawn Lin
36ddc25834 Add display shape config for redfin
Bug: 236935288
Test: make
Change-Id: I91931152332699d1c3b1db0af8bdc6ada404c6e7
2022-10-05 12:44:00 +08:00
Ray Chi
fa8c3bb8f3 recovery: add wait for dwc3 device to probe
If fastbootd starts before the dwc3 device probes, fastbootd
would be failed to enable USB gadget.

This patch adds a dependency on the dwc3 device probing before setting
the sys.usb.controller property.

Bug: 220393297
Test: build pass, fastboot works
Change-Id: I4e5b34354f19547f55acc53ccff0b54adce2d982
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
2022-08-26 07:43:53 +00:00
TreeHugger Robot
2988c93746 Merge "Dumpstate: get fsck log" 2022-08-22 04:41:18 +00:00
Xin Li
5e3e688da9 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1656b09fb0 -s ours am: 37a478ce28 -s ours am: 9d551e0a4f -s ours am: dac4924e7e -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2184300

Change-Id: Ib70a64bc2b8c9c42cfe468f197b062f4ba5f8a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 07:38:13 +00:00
Xin Li
dac4924e7e [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1656b09fb0 -s ours am: 37a478ce28 -s ours am: 9d551e0a4f -s ours
am skip reason: Merged-In I520e381950ddb0b7bce52ca38a4fd27e4cf0683c with SHA-1 caa2a07303 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2184300

Change-Id: I22262549fac7c741cedff9cc53fa409b92b27092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:07:14 +00:00
Xin Li
9d551e0a4f [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1656b09fb0 -s ours am: 37a478ce28 -s ours
am skip reason: Merged-In I520e381950ddb0b7bce52ca38a4fd27e4cf0683c with SHA-1 caa2a07303 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2184300

Change-Id: Idb55ba03aa4c2fc76f7fbb87d33c9415bfc696a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:50:54 +00:00
Xin Li
37a478ce28 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 1656b09fb0 -s ours
am skip reason: Merged-In I520e381950ddb0b7bce52ca38a4fd27e4cf0683c with SHA-1 caa2a07303 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2184300

Change-Id: I161f9d3c37a152ef16dbe04b0ad1abaee75478e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:21:14 +00:00
Xin Li
1656b09fb0 DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I520e381950ddb0b7bce52ca38a4fd27e4cf0683c
Change-Id: I298241a122e17bafa59da459aed8a585b926d0e6
2022-08-15 22:01:25 -07:00
Jaegeuk Kim
7a1521a0c0 Dumpstate: get fsck log
Bug: 241641121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Iaadb166fe9194518b2db75080cddc02526bdf2bb
2022-08-10 14:27:45 -07:00
Stephane Lee
b19c69c42e [automerger skipped] Add device-specific support for GoogleBattery AIDL V1 am: d543694a05 am: 991bcce28e -s ours
am skip reason: Merged-In Ia4ce4f7142804c56a43c0dc9869f4af39b984328 with SHA-1 afaa44272e is already in history

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

Change-Id: I13061800b3cf45a54283947eaad49440fb38e5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 00:13:19 +00:00
Stephane Lee
991bcce28e Add device-specific support for GoogleBattery AIDL V1 am: d543694a05
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/19330369

Change-Id: Ifa9089d0bb8bb51bb3503d3a455f9d00a74be175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 23:51:55 +00:00
Stephane Lee
d543694a05 Add device-specific support for GoogleBattery AIDL V1
Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: Ia4ce4f7142804c56a43c0dc9869f4af39b984328
Merged-In: Ia4ce4f7142804c56a43c0dc9869f4af39b984328
2022-07-22 00:33:31 +00:00
Christopher Ferris
0365193101 Force compile all targets as 64 bit. am: caa2a07303 am: a5d0d605ad am: 2d7f787148 am: a3ab5d2b06 am: fbbbe17bb0
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2153433

Change-Id: I58e04451a717c5c497729131db0d4f226cf89c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 23:59:40 +00:00