Commit graph

3847 commits

Author SHA1 Message Date
Kelly Rossmoyer
0eaf8638cc Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 00f40c2afd am: 4790d97161
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: I8cf9da3785574122d1bb4574bc261c31d10ada14
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:31 +00:00
Kelly Rossmoyer
62fe16f5d7 Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 00f40c2afd am: 4b2521427b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: If9f4831b04192ef9eae28e8681afbfd2fa9895e6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:02:12 +00:00
Automerger Merge Worker
4488b01cd2 Merge "Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 2f145d4c2e" into tm-d1-dev-plus-aosp 2022-04-25 04:42:01 +00:00
Kelly Rossmoyer
4790d97161 Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 00f40c2afd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: I41cdc00e3ee9026648184ee3cf9fb375448e540a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
8ff34f5fbc Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 2f145d4c2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: Ia61993ecf82f3d4cc355ba1b458a25cddae3752a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:54 +00:00
Kelly Rossmoyer
4b2521427b Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14 am: 00f40c2afd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: I9d7735f864f1aa3d42f637b902b0d1df768d9475
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:41:53 +00:00
Kelly Rossmoyer
00f40c2afd Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: Ib83070a8710000c3500800c88b98cdb47be02cd3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:15 +00:00
Kelly Rossmoyer
2f145d4c2e Revert "powerstats: set time limit as timeout for AoC" am: 9247e99d14
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17935514

Change-Id: I040df95b69930a73aadc44092ef3231e28a683b4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:16:51 +00:00
Kelly Rossmoyer
9247e99d14 Revert "powerstats: set time limit as timeout for AoC"
Revert "powerstats: set time limit as timeout for AoC"

Revert "powerstats: timeout mechanism for AoC data provider"

Revert submission 17800080-power-stats-aoc-timeout

Reason for revert: Causing crashes due to improper thread sync
Reverted Changes:
I71a9e6817:powerstats: timeout mechanism for AoC data provide...
I725c00745:powerstats: set time limit as timeout for AoC
I5b290a53d:powerstats: set time limit as timeout for AoC

Change-Id: Iac058ba7f0984bb86c505738c1eb20b7b6ddff83
2022-04-25 03:56:51 +00:00
Sal Savage
13b83d5e26 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: 39d0be80f8 am: cc992a9d2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I7e7615a1bd7ce9250dc784b6534c8a7a85d87640
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:30:57 +00:00
Automerger Merge Worker
6fc5826259 Merge "Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: e444e21178 am: daee5d5860" into tm-qpr-dev-plus-aosp 2022-04-22 23:28:23 +00:00
Sal Savage
bfb22f0d45 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: e444e21178 am: daee5d5860
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I19dc0c2f9272eccf41e33cea1e9e632f57f34f57
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:27:56 +00:00
Sal Savage
3133bde19f Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: 39d0be80f8 am: 529e934e80
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: Ib57681f400bbc4b506fdd5f5e25164c858d80eb7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:27:19 +00:00
Sal Savage
529e934e80 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: 39d0be80f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I8111e6e1ab2ccc56c3b54400ae7f2f30fca17256
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:05:30 +00:00
Sal Savage
cc992a9d2e Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: 39d0be80f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I5e01f457f9ef4ed34b556648cef7ba48f5746dd3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:05:17 +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
Sal Savage
daee5d5860 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3 am: e444e21178
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I0dcb4ac86dadc5358b96b2ca8b94f6f047b3cc4f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:56:04 +00:00
Sal Savage
39d0be80f8 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: I8e18e0a7200348f2feb3c6aeaae3ae67b73f83f8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:42:33 +00:00
Sal Savage
e444e21178 Update LE Audio profile properties to match spec and implementation am: 2e7610e4d3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17647386

Change-Id: Id8b4f1a21f2da905407668094365e36a7d26b8ea
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 22:40:23 +00:00
Sal Savage
2e7610e4d3 Update LE Audio profile properties to match spec and implementation
Bug: 217448211
Test: atest BluetoothInstrumentationTests
Change-Id: I5699914c673f4bdaeabef128ff94122bf1963f97
2022-04-22 22:06:39 +00:00
Albert Wang
5706c915e7 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: e83aa7ce0e am: 286a29e026
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: Id6c4ce1381f1691274dfab0b716b36d76e2456f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:29:36 +00:00
Albert Wang
fcb415ad0b Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: e83aa7ce0e am: c37ff17a50
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: I56f1aee3ba8f275cf194ba339a644267c1e4a16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:21:34 +00:00
Albert Wang
fef3e1e669 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: b1698b7859 am: 965e5a4043
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: Ib3473fb21644949c5014fed3b44f7aefc744fb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:17:19 +00:00
Albert Wang
286a29e026 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: e83aa7ce0e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: I11e33d676681ed42049ca4cb6d7f45d0d9931b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:09:18 +00:00
Albert Wang
965e5a4043 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: b1698b7859
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: Ic0e36bf226a32c2617e8ed77dfd5f10ebd32dce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:49:02 +00:00
Albert Wang
c37ff17a50 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069 am: e83aa7ce0e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: I63eb7371acecd6608df571b83a33e3a2d6579fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 04:24:26 +00:00
Albert Wang
e83aa7ce0e Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: Ifa8f92b629b7f23c69b583501007feeb5366be01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:29:05 +00:00
Albert Wang
b1698b7859 Updat CleanSpec.mk for USB HAL migration to AIDL am: 1bcc5fc069
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822613

Change-Id: I05cd2056b21df20f68beb4ad97777ed5351f12e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:28:19 +00:00
Albert Wang
1bcc5fc069 Updat CleanSpec.mk for USB HAL migration to AIDL
Bug: 227729582
Test: build
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: Ia8d49a824fd7c2c81c3cbfb5e004132aa3ac580f
2022-04-22 02:50:44 +00:00
chungkai
7453ff6ec8 powerhal: update new boost uclamp value am: b3a98db247 am: 552577e8d0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822611

Change-Id: Idb7e23a22c1f50138e87664901e09e4b13db69e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:29:22 +00:00
chungkai
552577e8d0 powerhal: update new boost uclamp value am: b3a98db247
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17822611

Change-Id: I164eff7cd6a35f0f7faaec15d879038301b851a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:07:34 +00:00
chungkai
b3a98db247 powerhal: update new boost uclamp value
update new boost uclamp value since we update
cpu capacity

Test: PTS UIBench has no obvious difference
Bug: 224649226
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Ie2fd9950a98f9786b03ef4e364fd9d584dcc438d
2022-04-21 16:49:00 +00:00
Darren Hsu
fcd6f954aa powerstats: set time limit as timeout for AoC am: 334bd6d2ec am: 358498697c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17799890

Change-Id: I7d7e8790f13418c60eca709ecf12720dc4c991aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:57:55 +00:00
Darren Hsu
358498697c powerstats: set time limit as timeout for AoC am: 334bd6d2ec
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17799890

Change-Id: I56d280a6ccea433dcd7f656e47e008b1639bb5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:41:59 +00:00
Darren Hsu
334bd6d2ec powerstats: set time limit as timeout for AoC
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I5b290a53dcd5325aa55fd95a42c1af95066f550c
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2022-04-21 04:07:54 +00:00
Xin Li
ae18170bb5 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 4bf5985951 am: a3cc2e0bbd am: b56f1c446f am: 4a764fbc86
Original change: undetermined

Change-Id: Ie36edb6a146ace2f2363b28be285fb06aa10402b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:33:18 +00:00
Sal Savage
eec395aca0 [automerger skipped] Enable bluetooth profiles with product.prop am: 3f9ed7fc84 am: 61d84ceb4a am: 9f67d7a1bb -s ours am: 2de955a27e -s ours am: 33640ee8e0 -s ours
am skip reason: Merged-In Id96e675bd0bc162329264c935d4418c0c6a52390 with SHA-1 52c99f6b72 is already in history

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

Change-Id: Ic15eeb50eae1409b50119cb2779cdf029ab3feeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:23:57 +00:00
Xin Li
4a764fbc86 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 4bf5985951 am: a3cc2e0bbd am: b56f1c446f
Original change: undetermined

Change-Id: Iad3e736f1337f60102128143d2358219687ba8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:13:25 +00:00
Sal Savage
33640ee8e0 [automerger skipped] Enable bluetooth profiles with product.prop am: 3f9ed7fc84 am: 61d84ceb4a am: 9f67d7a1bb -s ours am: 2de955a27e -s ours
am skip reason: Merged-In Id96e675bd0bc162329264c935d4418c0c6a52390 with SHA-1 52c99f6b72 is already in history

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

Change-Id: Icc285463e4ce50cb933830396c4ae6124e9d3267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:10:44 +00:00
Xin Li
b56f1c446f Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 4bf5985951 am: a3cc2e0bbd
Original change: undetermined

Change-Id: I563b91d0b624a6cc8ceded879a17dc7cdb846e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:47:31 +00:00
Sal Savage
2de955a27e [automerger skipped] Enable bluetooth profiles with product.prop am: 3f9ed7fc84 am: 61d84ceb4a am: 9f67d7a1bb -s ours
am skip reason: Merged-In Id96e675bd0bc162329264c935d4418c0c6a52390 with SHA-1 52c99f6b72 is already in history

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

Change-Id: Ia7098c6f5f02536d9ac99908cc7898d69f6ae224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:43:53 +00:00
ykhung
23bc01915c Add BLUETOOTH_CONNECT permission for SettingsIntelligence am: 675b52bdef am: a2e52de255
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17799996

Change-Id: I6476a2e771609b984efe31a0ce233b1bd2f45c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 14:46:38 +00:00
ykhung
a2e52de255 Add BLUETOOTH_CONNECT permission for SettingsIntelligence am: 675b52bdef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17799996

Change-Id: I26cdb7af067a9137a5bf9ecc017b0c034b5f48c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 14:30:15 +00:00
ykhung
675b52bdef Add BLUETOOTH_CONNECT permission for SettingsIntelligence
Add BLUETOOTH_CONNECT permission for SettingsIntelligence, which is required for the battery widget feature to launch the detailed bluetooth settings page in the Settings

Test: build
Bug: 227265502
Change-Id: I166c0ed987b82428583243e52c343dda30a93ba4
2022-04-19 07:56:24 +00:00
Xin Li
a3cc2e0bbd Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 4bf5985951
Original change: undetermined

Change-Id: Iac7df5d07b73e671b884c4407a3f847d34b9a105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:08:15 +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
9f67d7a1bb Enable bluetooth profiles with product.prop am: 3f9ed7fc84 am: 61d84ceb4a
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2060600

Change-Id: I020ed5f04d996b2ec8721775a3021bbe874baeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:12:50 +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
Edwin Tung
0dbb153b1e Revert "gps: update gps driver 140.20.23.532343" am: 45ea48cfc6 am: 6633accd26
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17731253

Change-Id: I74fb12cb67ceb2704e8f5e32fa7f3ab40a95408f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 04:43:05 +00:00