Commit graph

1909 commits

Author SHA1 Message Date
Xin Li
231755345a Merge SQ3A.220605.009 am: de7209e8a0
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132

Change-Id: I5a6344108b6f407aa85eee434472a5e403baab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 14:09:47 +00:00
Xin Li
de7209e8a0 Merge SQ3A.220605.009
Bug: 236045730
Merged-In: I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f
Change-Id: I7baa7d362aab400eefab4e1a833a31cd3798d118
2022-06-16 22:42:57 -07:00
Xin Li
b6ef0dc62f [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2126014

Change-Id: If4a9406c9249ce27322f3d9d753ae979c46064e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:13 +00:00
Xin Li
b03bfa6ccf Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I42565f0acc744669c6c335543a6f1470ad326d4e
Change-Id: I6bdaaa95e15701057feb53924cf74f5d5a28b651
2022-06-14 16:40:14 -07:00
Pierre-Clément Tosi
42cc5cd651 Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125

Change-Id: I42565f0acc744669c6c335543a6f1470ad326d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:55:01 +00:00
Pierre-Clément Tosi
3ba1a0dd6b Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS"
This reverts commit e571bb8979.

Reason for revert: Breaks aosp_raven-userdebug (go/ab/8636239) as pvmfw.img is in PREBUILT_IMAGES/ but add_img_to_target_files.py looks for IMAGES/pvmfw.img.

Change-Id: I179e8ebda19e9f10e80ba2b7ee0f5fdb40a1c7d4
2022-05-24 18:53:47 +00:00
Pierre-Clément Tosi
eb06e70e62 gs101: Add pvmfw to AB_OTA_PARTITIONS am: e571bb8979
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105124

Change-Id: If0450a6f122609d2d0996274bf29a6085cc9e188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 18:15:42 +00:00
Pierre-Clément Tosi
e571bb8979 gs101: Add pvmfw to AB_OTA_PARTITIONS
Suggested-by: Cyan_Hsieh <cyanhsieh@google.com>
Bug: 210833963
Test: OTA update
Change-Id: Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d
Merged-In: Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d
(cherry picked from commit 871071afbc)
2022-05-24 17:47:23 +01:00
Kyle Tso
d1e76e74ef dumpstate: Dump logs am: 21502f2978
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2098913

Change-Id: I4a7de39f80fc91443c3405278c66d48cc0a5ff61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:56:40 +00:00
Kyle Tso
21502f2978 dumpstate: Dump logs
Bug: 232556226
Test: log dumped in bugreport
Signed-off-by: Kyle Tso <kyletso@google.com>
Change-Id: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b
2022-05-19 02:12:58 +00:00
Alice Kuo
eac4ac0ebe Disable LE audio related profiles for gs101 am: c014e57ffd
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2093886

Change-Id: I093fe819ddbad7d2ca70165e1bab358623c91b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:17:05 +00:00
Alice Kuo
c014e57ffd Disable LE audio related profiles for gs101
Bug: 231671426
Test: build
Change-Id: I39c98cfd51047113f203d05c6f6853e635b02c45
2022-05-11 08:48:54 +08:00
Android Build Coastguard Worker
8a03cebba7 Merge cherrypicks of [18140922] into sc-qpr3-release.
Change-Id: Iabbe6038d0eaa3948b59e33317b218a7e08c58b4
2022-05-06 18:47:04 +00:00
Edwin Tung
95b9601e73 [DO NOT MERGE][R4O6] gps: update gps driver 129.20.23.535937
Disable SUPL OTDOA for VZW
Fix SUPL Earlyfix issue while OTDOA disabled

Bug: 230818100

Verify test: 231297970

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestCases

Change-Id: I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f
Merged-In: Ibf8e8ccf361fb5b0a58ef97c45f581fc50ab2788
(cherry picked from commit 346895302a)
Merged-In: I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f
2022-05-06 18:46:49 +00:00
Sal Savage
c0014f19cc Merge "Set default the Bluetooth class of device" am: fff19eff05
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2084046

Change-Id: Ia6182eac0124c5fb5b604eaaf27a187ad7293a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:40:17 +00:00
Sal Savage
fff19eff05 Merge "Set default the Bluetooth class of device" 2022-05-05 02:11:16 +00:00
Ray Chi
b0e42703dc usb: remove set_usb_irq script for irq change am: a5f995d2f6
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2086725

Change-Id: Ibb7033758bec0c996ad1f56a3f244f126f54ae22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:52:11 +00:00
Ray Chi
c64676a8f3 tune usb irq (dwc3) in usb gadget hal am: 49a9b9f3dd
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2086724

Change-Id: If8a89675a8de03ede087e8ffbc72869a23c65182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:52:07 +00:00
Ray Chi
35a0d7b464 usb: move the permission change to usb rc am: bc34b8944f
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2086723

Change-Id: I55a9c5e2b71b07ee88f87c416c7dcb98dcf5b4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:52:04 +00:00
Ray Chi
a5f995d2f6 usb: remove set_usb_irq script for irq change
Since the dwc3 irq is moved by USB gadget hal now, the
script is not needed.

Bug: 194346886
Test: build pass
Change-Id: Iea0aed110183d9583db00d9b182d351de41573cd
2022-05-04 09:43:58 +08:00
Ray Chi
49a9b9f3dd tune usb irq (dwc3) in usb gadget hal
Since affinity permission is changed from root to system, original
permission change by script can't be used. Therefore, this patch
will move the functionality to usb gadget hal.

Bug: 220996010
Test: dwc3 irq could be located in medium/big cores after USB function switch
Change-Id: Id993db9fc303e85a9a6337a0e41b1dfd6fc9a86a
(cherry picked from commit f363704a92fd7611cf01c8b3bcaf6e8913255207)
2022-05-04 09:39:42 +08:00
Ray Chi
bc34b8944f usb: move the permission change to usb rc
Since permission change in hal rc may be late, gadget
hal would enable USB function failed. The solution will
change the permission before USB gadget hal starts.

Bug: 206902205
Test: build pass and verified pass
Change-Id: I45c1318f647220480fa03ba3b813a81b21393d71
(cherry picked from commit b30924e3599f2e92aeae498a6ae15d3b9a397930)
2022-05-04 09:39:29 +08:00
Sal Savage
249302343c Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814

Change-Id: I8292a770a5296c9705b26f1b72f8187025b30982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 00:09:08 +00:00
Sal Savage
e4a5a19b77 Merge "Use the ?= operator so BT properties can be overridden" 2022-05-02 23:35:28 +00:00
Bob Badour
9551dcd091 [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 am: 733255eb8a
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079805

Change-Id: I8ad98563970ff8a62980c155563fae2d81b8a8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:32:11 +00:00
Sal Savage
15407fe4e9 Set default the Bluetooth class of device
The class of device is a string with a list of uint8t values:
90,2,12

The meaning is as follows:
{Service Field, Major class, Minor class}

Service Field: 0x5A -> 90
    Bit 17: Networking
    Bit 19: Capturing
    Bit 20: Object Transfer
    Bit 22: Telephony
MAJOR_CLASS: 0x02 -> 2 (Phone)
MINOR_CLASS: 0x0C -> 12 (Smart Phone)

Bug: 217452259
Test: make -j; -- check that bluetooth.device.class_of_device is
correct

Merged-In: I75a6fb83a6149f58372b7aa46ccc190fd4451ab0
Change-Id: I75a6fb83a6149f58372b7aa46ccc190fd4451ab0
2022-05-02 13:29:47 -07:00
Sal Savage
0eea03d28a Use the ?= operator so BT properties can be overridden
System properties set with the "=" operator cannot be overriden. This
device is used elsewhere in the system and some of the properties need
to be overridden. The "?=" operator will use the assigned value if no
other values are assigned elsewhere, allowing for overrides.

Bug: 230638462
Test: adb shell getprop | grep bluetooth
Merged-In: I45b1786f5556ba3e7d493ea17dc955cd317a1156
Change-Id: I45b1786f5556ba3e7d493ea17dc955cd317a1156
2022-04-28 14:17:27 -07:00
Bob Badour
733255eb8a [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101
Added SPDX-license-identifier-Apache-2.0 to:
  usb/usb/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ia02ed8b48bc532d6fbffc8bb5656be88634301c4
2022-04-28 11:32:33 -07:00
Treehugger Robot
61384462ac Merge "Migrate IUsb implementation to AIDL" am: 798dbb39f5
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2045080

Change-Id: Ie660c0cf4ab12717445ea26ed6cedccfa762dc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Treehugger Robot
798dbb39f5 Merge "Migrate IUsb implementation to AIDL" 2022-04-27 16:21:29 +00:00
Sal Savage
79671e4a0f Update LE Audio profile properties to match spec and implementation am: 4e33220086
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2072118

Change-Id: I603b3899dfa54e8291ab87f7d4978288328ca6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:48:34 +00:00
Sal Savage
4e33220086 Update LE Audio profile properties to match spec and implementation
Bug: 217448211
Test: atest BluetoothInstrumentationTests
Merged-In: I5699914c673f4bdaeabef128ff94122bf1963f97
Change-Id: I5699914c673f4bdaeabef128ff94122bf1963f97
2022-04-22 22:59:25 +00:00
Xin Li
4bf5985951 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master 2022-04-18 23:39:19 +00:00
Sal Savage
61d84ceb4a Enable bluetooth profiles with product.prop am: 3f9ed7fc84
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2060600

Change-Id: I389d076b7ed9fd61409678fe09bbe2c0a01c1fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 21:40:05 +00:00
Xin Li
0cad6be852 Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I87467605520d5dd168c3b03ac3b699800bd96030
Change-Id: I12365876665df7bc4405835f4abf5a35884415a3
2022-04-18 21:00:59 +00:00
Sal Savage
3f9ed7fc84 Enable bluetooth profiles with product.prop
Bug: 217448211
Test: make -j
Merged-In: Id96e675bd0bc162329264c935d4418c0c6a52390
Change-Id: Id96e675bd0bc162329264c935d4418c0c6a52390
2022-04-12 13:06:22 -07:00
Android Build Coastguard Worker
16e4950d10 Merge cherrypicks of [17655078] into sc-qpr3-release.
Change-Id: I026b4e86d8d4ba7b292207fcf79ca852600e1d8e
2022-04-11 23:06:01 +00:00
Eric Laurent
b5fc3d7e69 Revert "Build with spatializer feature"
Bug: 223736548
Test: make

This reverts commit 8e6ff8503d.

Change-Id: I0c03e3b62452b92a015e13c28292e93134c294a9
(cherry picked from commit 1d5d80bcf7)
Merged-In: I0c03e3b62452b92a015e13c28292e93134c294a9
2022-04-11 23:04:30 +00:00
Android Build Coastguard Worker
5a80e67250 Snap for 8426946 from c8d93dd9f7 to sc-qpr3-release
Change-Id: I00ef2b1791fa32c7cf316e2dedd75be3fd814d33
2022-04-09 01:01:00 +00:00
shawnlin
9820c19ec1 Fixed status bar glitch for apps that access internal resource dimen am: c8d93dd9f7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17536006

Change-Id: Ia0c569e11d6babe6c2312bc61bc64cd44fd2294b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 13:59:35 +00:00
Xin Li
6e217905f3 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b -s ours
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76 is already in history

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

Change-Id: I51b157da898e69fc63a95e34f60d4c07b1285073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:59 +00:00
Xin Li
2201804c6b Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I56e2296651999e37048f8be4c53d7c5b9281666f
Change-Id: I53581f8c0cd4d3e220faf53468f4d571cb823f4c
2022-04-01 20:32:11 +00:00
shawnlin
c8d93dd9f7 Fixed status bar glitch for apps that access internal resource dimen
Bring back old usage of status_bar_height, status_bar_height_portrait,
and status_bar_height_landscape by set the size containing cutout size.

Bug: 216782082
Test: make
Change-Id: I87467605520d5dd168c3b03ac3b699800bd96030
2022-04-01 16:37:55 +08:00
Edwin Tung
bca92bdc76 [DO NOT MERGE] gps: update gps driver 129.20.23.529478
Fix NI control plane issue
Add NFW IPC between AP and CP
Ignore RTI in cold start
Fix OnChip logging issue

Bug: 221337679
Bug: 216098015
Bug: 219856838
Bug: 213009701

Verify test: 224635609

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner

Change-Id: I56e2296651999e37048f8be4c53d7c5b9281666f
2022-03-31 05:12:19 +00:00
Edwin Tung
8d71c97361 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours
am skip reason: skipped by user edwintung

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

Change-Id: I44b43b854d4c7e25235570bfe43e10209434b8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 00:41:26 +00:00
Android Build Coastguard Worker
62d4dfeaeb Snap for 8385304 from f1a2063e14 to sc-qpr3-release
Change-Id: Icef2f8764f8ecaa27edfc6ac0d621ae878311490
2022-03-30 23:01:26 +00:00
Edwin Tung
f1a2063e14 [DO NOT MERGE] gps: update gps driver 129.20.23.529475
Add NFW IPC between AP and CP
Fix NI control plane issue
Ignore RTI in cold start
Fix OnChip logging issue

Bug: 216098015
Bug: 221337679
Bug: 219856838
Bug: 213009701

Verify test: 224635609

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner

Change-Id: I89fcf1f61fce350201e6b433895289d3a3912c61
2022-03-30 11:33:18 +00:00
Presubmit Automerger Backend
95c69ea86e [automerge] Disable spatial audio feature 2p: 68f33d6043
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Bug: 225119469
Change-Id: I8e22f367c4815081e403f3f5c3d6be0b2928e193
2022-03-29 14:10:50 +00:00
Eric Laurent
68f33d6043 Disable spatial audio feature
Bug: 225119469
Test: verify MP3 offload
Change-Id: I6a8956ed8a0873cd2426c6a81d79452cc1f5b78f
2022-03-28 20:14:16 +02:00
Badhri Jagan Sridharan
3604f56e5e Migrate IUsb implementation to AIDL
This change migrates IUsb implementation to AIDL.
Also, IUsb and IUsbGadget now run in its own processes
to improve stability and isolation.

Bug: 200993386
Bug: 199357330
Change-Id: I02753af4a41916b77ce110f9531504bf8c6a4691
Merged-In: I02753af4a41916b77ce110f9531504bf8c6a4691
(cherry picked from commit 3c97a6bb68)
2022-03-28 17:00:28 +08:00