Commit graph

2952 commits

Author SHA1 Message Date
Will Song
98c6046196 thermal: Change "NAN" to "NaN"
For schema parsing, protobuf parses "NaN" as float but not "NAN."

Test: Flash and check sensor values.
Bug: 127794899
Change-Id: I01549ecdabf4fe6af1cff685b97f8f18b0dd3003
2023-11-07 05:39:45 +00:00
Calvin Huang
c6cf31304f Merge "Use ?= to set ro.com.google.ime.height_ratio" into main 2023-11-06 23:41:51 +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
Roshan Pius
c2a6f0f1db Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-06 14:31:02 +00:00
Roshan Pius
be17ee4caf Merge "Revert "shusky: Replace NFC app with NFC apex"" into main 2023-11-06 14:31:02 +00:00
Roshan Pius
d92852d647 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-04 19:01:06 +00:00
Roshan Pius
4454d4b92a 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-04 14:59:09 +00:00
Calvin Huang
4f04b2e048 Use ?= to set ro.com.google.ime.height_ratio
So husky_ui_portrait_car can reset it.

Bug: 308193602
Test: lunch husky-userdebug && make
Change-Id: Ifd522ca4fab079f89ee1b65fb0c5479a58419954
2023-11-03 20:20:19 +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
f75df0a6f9 gps: set high accuracy shape mode to 1 am: 6f2da6ead2 am: 115303a1f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25241713

Change-Id: Ib4a00dfba71c14ee80d8af9d087646314ce61488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:22:20 +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
Wei Wang
5d0012dd7d Merge "thermal: add cdev_ceiling for all throttling profiles" into main 2023-11-01 05:41:45 +00:00
Treehugger Robot
8ca772634f Merge "wifi: Aggregate radio stats in link layer stats." into main 2023-11-01 02:32:20 +00:00
Juan Yescas
fa2dd24cd4 16k: Add aosp shusky pgagnostic targets that will use 5.15 kernel
The aosp shusky pgagnostic targets will use 5.15 kernel.

Bug: 308663939

Test: source build/envsetup.sh
      lunch aosp_shiba_pgagnostic-trunk-userdebug
      m
Change-Id: Idf85cb903cdf2e11df595b495f0313603bc54ead
2023-10-31 15:41:50 -07:00
Hasan Awais
add0c820fc uwb: update uwb calibration
Bug: 308683676
Change-Id: I4b77bf8eee20494418267bbdf4ffc2d8b76c2b05
Signed-off-by: Hasan Awais <hasanawais@google.com>
2023-10-31 15:33:38 -07:00
TeYuan Wang
0c44af3a62 thermal: add cdev_ceiling for all throttling profiles
Align the same cdev_ceiling for all the profiles to avoid the unexpected throttling request when switching the profile.

Bug: 308646952
Test: emul_temp VSKIN, and monitor thermal throttling log with
open/close camera

Change-Id: Id108ccea6da4f82fe24ed6d275d6d4688ee78c02
2023-10-31 22:08:15 +00:00
kensun
7cf2e18bab wifi: Aggregate radio stats in link layer stats.
Set config_wifiLinkLayerAllRadiosStatsAggregationEnabled to true
So that framework can understand radio stats in general.

Bug: 302224360
Test: Manual
Change-Id: I91789de624faaf38af7894c7c5f7a455044d1d11
2023-10-31 11:29:27 +00:00
kensun
c25be76c0b wifi: driver supports NL80211 Reg changed event.
Set config_wifiDriverSupportedNl80211RegChangedEvent to true
So that framework can correctly updated country code and associated
channel list.

Bug: 289874603
Test: Manual
Change-Id: I6a259476c8cb8adb92ddd06eaf31009c9e0d6ccd
2023-10-31 09:36:43 +00:00
YoonKyung Kim
770a0aa43d Merge "Delete Shusky media_profiles from device/google" into main 2023-10-31 06:47:23 +00:00
yoonkyungkim
c2d6e555d6 Delete Shusky media_profiles from device/google
media_profile contains potentially sensitive data.
These files should not be located in device/google, since this folder
history is visible in AOSP.

Test: build success(source build/envsetup.sh && lunch
husky/shiba/ripcurrent-trunk_staging-userdebug && m)
Test: Manual test with GCA(video recording)
Bug: 305170657
Change-Id: Ia9976f9ec1760c43fa88780133bd06c34318bf6a
2023-10-30 06:48:21 +00:00
David Li
2ba52304a1 Merge "audio: replace PRODUCT_COPY_FILES with PRODUCT_PACKAGES and prebuilt_etc" into main 2023-10-30 06:38:17 +00:00
Will Song
9756c0bba0 Merge "PREUPLOAD: Enforce jsonlint in preupload" into main 2023-10-29 07:20:03 +00:00
Will Song
278583922f PREUPLOAD: Enforce jsonlint in preupload
Checks syntax and simple brace balances for all JSON files.

Test: Edit any json file and try upload
Bug: 127794899
Change-Id: I2fc6b4cddb8d8da6c72023bd7dc3a580104d6802
2023-10-29 06:11:23 +00:00
Treehugger Robot
5570c72ec3 Merge "Fix lunch choices for git_main" into main 2023-10-27 14:24:14 +00:00
Treehugger Robot
cd796b8d37 Merge "shusky(nfc): Modify NFC overlays for NFC apex" into main 2023-10-27 03:38:12 +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
e85cd6dde0 [automerger skipped] Jump SVN to 5 am: 7d60b2a6bc -s ours am: 928ed99aab -s ours am: 9cccdb9e2b -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I0635e8cb151c29348701176a078e9ac8f06d86fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 01:50:51 +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
Roshan Pius
3f970e7ab1 shusky(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ie400238eaf2d1e229ea80bfc4c2f12a5edc79437
2023-10-26 09:41:24 -07:00
David Li
c514210662 audio: replace PRODUCT_COPY_FILES with PRODUCT_PACKAGES and prebuilt_etc
Bug: 307473885
Test: mm
Change-Id: I62c8fc2c6ff991fe52a5ade08694f09f8e830eae
2023-10-26 17:24:03 +08:00
Carter Hsu
74f94def6a audio: add opus support for decoded offload
Bug: 307837960
Test: see the bug
Change-Id: Ic059da601ef23d6e2fa3b62f70abba001560ee78
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-10-26 01:52:04 +00:00
Greg Kaiser
748a543cf5 Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
2023-10-25 16:41:56 -06:00
Lokesh Kumar Goel
1304fd7a3b Merge "Update husky SVN to 6" into udc-qpr-dev am: 0ea0cdcd3e am: 6cbf76d4f2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25007722

Change-Id: Ia1df3527579548a03e297ec88263e7399959e06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:10:45 +00:00
Lokesh Kumar Goel
08c39113b7 Merge "Update shiba SVN to 6" into udc-qpr-dev am: e29162279c am: 1a23eb9c77
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25010336

Change-Id: I323f8753da4527c55b0e541f68c922a729bf7016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:09:55 +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
Lokesh Kumar Goel
e29162279c Merge "Update shiba SVN to 6" into udc-qpr-dev 2023-10-25 19:58:52 +00:00
Alex Hong
7d60b2a6bc Jump SVN to 5
Test: adb shell getprop ro.vendor.build.svn
Bug: 307649088
Change-Id: I3b11353f38cfe4d30cb27ccc6b83bf9975407526
2023-10-25 04:10:16 +00:00
Roshan Pius
de9bf207f8 shusky: Replace NFC app with NFC apex am: 20a2f7b30c am: 63f80a61a6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25163924

Change-Id: I303c9c7aad6223e0e8736993b0ce54b0459267fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 19:19:52 +00:00
Roshan Pius
63f80a61a6 shusky: Replace NFC app with NFC apex am: 20a2f7b30c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25163924

Change-Id: I024699f91d0aa130455633e1a16fb3a3cd6ec669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 18:24:46 +00:00
Roshan Pius
20a2f7b30c shusky: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Change-Id: Id4e1b40e5a077f8e0f1e342e01d28a9a1a34c4d0
2023-10-24 09:30:47 -07:00
Sam Ou
b27941c91e Merge "thermal: increase passivedelay to 600 seconds" into main 2023-10-24 07:35:32 +00:00
Cyan_Hsieh
b2356df108 use AP1% for 24Q1 build
Bug: 299879102
Change-Id: I0f040f9eda38fd40170be64433838b6a063f44ef
2023-10-24 11:25:03 +08:00