Commit graph

1729 commits

Author SHA1 Message Date
LaMont Jones
a812b3d290 [automerger skipped] Use release_config_map.textproto am: 7e20e0e5ca -s ours
am skip reason: Merged-In I0459a6531d0429471fe6232e868e26cfdb05ae83 with SHA-1 8ec9a1a27c is already in history

Original change: https://android-review.googlesource.com/c/device/google/akita/+/3163656

Change-Id: I41417ea10fdacd6aa96e6c104629f1e49161fb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 16:15:25 +00:00
LaMont Jones
7e20e0e5ca Use release_config_map.textproto
The .mk files are no longer used, and will be deleted soon.

Bug: none
Test: manual, TH
Merged-In: I0459a6531d0429471fe6232e868e26cfdb05ae83
Merged-In: I52d615ccedbd3a3f504a6be2d607808516c1af86
Change-Id: I8e7a465d8a80f05020f7483f4e59ef7e76de73a1
2024-07-09 15:26:44 +00:00
Herbert Xue
c629f6c49e Convert sensors.akita to Android.bp am: 49ee5cf28e
Original change: https://android-review.googlesource.com/c/device/google/akita/+/3160218

Change-Id: Icc18f0437808aa7df754a1e0776edb5d7e1e3e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-09 03:14:09 +00:00
Herbert Xue
49ee5cf28e Convert sensors.akita to Android.bp
Bug: 351252378
Test: lunch aosp_akita-trunk_staging-eng && m sensors.akita
Change-Id: I8f2743771995826b1bf14720bd2333f9257bc9e3
2024-07-05 15:48:22 +08:00
Xin Li
03e23caae0 Revert "DO NOT MERGE ANYWHERE"
DO NOT MERGE ANYWHERE Revert submission 27954911-bandaid_348495820

Reason for revert: proper fix for b/347068412 is in.

Reverted changes: /q/submissionid:27954911-bandaid_348495820

Change-Id: I89f86605a09ec4fe6cf52307754b4982a0efa53f
2024-06-25 09:26:56 +00:00
Xin Li
3a52399175 DO NOT MERGE ANYWHERE
akita: Temporarily set kernel and bootloader to an existing place

This should be reverted once we have a better solution.

Bug: 348495820
Merged-In: Ia24088ab76973c93dbae76031e3df253c89de8a1
Change-Id: I63b0cfc8917767b979ddb4a25bb5205f195a61c2
2024-06-21 02:11:54 +00:00
Xin Li
05d8f24336 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: Id37fb8c2599d72b0ee591cf0080c73ab1cc31690
Change-Id: Ia24088ab76973c93dbae76031e3df253c89de8a1
2024-06-18 14:13:21 -07:00
vincenttew
4e1cbcf94c audio: add sound dose offset curve
Bug: 313395588
Test: boot to home, HIDL/AIDL w/wo xml configuration
Change-Id: Id37fb8c2599d72b0ee591cf0080c73ab1cc31690
Signed-off-by: vincenttew <vincenttew@google.com>
2024-06-14 02:37:58 +00:00
Cheng Chang
c731428b77 gps: Fix the build break
Bug: 332204989
Test: Verify the compile successfully at b/332204989
Change-Id: I76c9ee16bea513e6fa784a764f4878ef4e2c0ab5
2024-06-13 01:47:34 +00:00
Peter (YM)
1e69353f5c Merge "thermal: Move TPU to the VSKIN-SOC PID loop" into main 2024-06-12 03:06:40 +00:00
Ed Tam
8ec9a1a27c Update AOSP Akita release config map path
Bug: 345972201
Change-Id: I0459a6531d0429471fe6232e868e26cfdb05ae83
2024-06-10 19:09:00 +00:00
Xin Li
2e7593c784 [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 896a728433 -s ours
am skip reason: Merged-In I3c429fb5b476b4023b0bbe6174b096cf61dbf8cc with SHA-1 b50cdb7c73 is already in history

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

Change-Id: I43db9878a982cfbbe01b68d91e35082d3d7e0a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:32 +00:00
Xin Li
896a728433 Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I3c429fb5b476b4023b0bbe6174b096cf61dbf8cc
Change-Id: I1cda57f2fe6f2cabbdab38b73b8025bc035b523c
2024-06-05 14:12:12 -07:00
Peter (YM)
a8b2380667 thermal: Move TPU to the VSKIN-SOC PID loop
Bug: 345115917
Test: run TPU test
Change-Id: I13ec28e2046398f6d019c3f30833b21fc8607e47
Signed-off-by: Peter (YM) <peterym@google.com>
2024-06-05 07:25:49 +00:00
Xin Li
6d94b15559 [automerger skipped] akita: only depend on vendor/ project if they are present. am: d27454c170 -s ours
am skip reason: Merged-In I52d615ccedbd3a3f504a6be2d607808516c1af86 with SHA-1 4c6e4c7d94 is already in history

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

Change-Id: Ic43b320d9018988999021414d73c8ded9cdb0391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 21:48:17 +00:00
Xin Li
d27454c170 akita: only depend on vendor/ project if they are present.
Bug: 317784824
Merged-In: I52d615ccedbd3a3f504a6be2d607808516c1af86
Change-Id: I6db75201d4bb3c9a675447f9f0f106af5ae191dd
2024-05-30 17:40:12 +00:00
Treehugger Robot
da09fc70f5 Merge "Switch makefile owners to MK_OWNERS" into main 2024-05-30 08:16:16 +00:00
kuanyuhuang
8b992f0e4a BT: LE Audio use phase 3 configuration
Show LE Audio toggle at Bluetooth detailed device setting.

Bug: 340135622
Test: check system property and LEA toggle
Change-Id: I31837d980d602100d169102e51dccd9fd96c31c7
2024-05-29 01:58:37 +00:00
Cyan_Hsieh
a1c5570236 Switch makefile owners to MK_OWNERS
Bug: 278167548
Change-Id: I49eb74361be6c0ddf7a609b4615f6bdf45e47b51
2024-05-24 15:51:53 +08:00
Treehugger Robot
ca7afe5937 Merge "audio: remove unused device" into main 2024-05-23 07:57:30 +00:00
Xin Li
627e1b1b7b [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 434cde7a85 -s ours
am skip reason: Merged-In I4dbca2b8e90af67ce064c0a1e82807636b7c76a8 with SHA-1 63e7b91d44 is already in history

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

Change-Id: I653f5c47a034793039a1e19963f769ce34fb1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 18:07:41 +00:00
Ravi Jain
4179e825aa Merge "Vibrator: Set Soong Config variable - kernel_ver" into main 2024-05-20 11:00:39 +00:00
Ravi Jain
878142e02e Vibrator: Set Soong Config variable - kernel_ver
Bug: 340148508
Test: Build and check fw files in all devices.
Change-Id: Iced0ba4a08a67f4331bc9250e7ffbbac5b287fdb
2024-05-20 06:50:58 +00:00
Cheng Chang
981c6b6734 Merge "gps: Add libcustomgnss library to dependency" into main 2024-05-17 02:42:18 +00:00
Treehugger Robot
5e0ef7b6cc Merge "gps: update gps 4.13.2_13" into main 2024-05-16 16:44:44 +00:00
Edwin Tung
09a58ab0da gps: update gps 4.13.2_13
Fix SUPL over WIFI when no WWAN ID
Add fault_reqest_watch_thread flag
SETCaps_SuplUT1=20
Make sure onStart() and onStop() are received in GnssStatus.Callback
incr hw_clock_discontinuity_count
select_abortable_abort() enhancement to avoid race condition
Only request CellInfo of current air interface for GED phone
Fix gnssd and gnss service crash issues

Bug: 336398796
Bug: 335898054
Bug: 315212984
Bug: 336736850
Bug: 317832296
Bug: 334719512
Bug: 333845107
Bug: 333831102
Bug: 336965237
Bug: 332026502
Bug: 331733053
Bug: 335594718

Test: b/339756841
atest CtsLocationGnssTestCases
atest VtsHalGnssTargetTest

Change-Id: Id75e023fdd1cb24eeba322cbbe346527a4a0b030
2024-05-16 10:45:06 +00:00
Cheng Chang
8d55b28a5f gps: Add libcustomgnss library to dependency
Bug: 340977648
Test: Verification boot-health at b/340977648#comment2
Test: Verification the function has been called by gnss.
Change-Id: I72dedc36512361446b9f9132a57b552366991e87
2024-05-16 06:40:43 +00:00
Cyan Hsieh
0cf26e3add Merge "Update bootloader pdk folder and soong config" into main 2024-05-15 14:01:34 +00:00
Android Build Coastguard Worker
1de6d22a77 Merge cherrypicks of ['googleplex-android-review.googlesource.com/27188002', 'googleplex-android-review.googlesource.com/27345355'] into 24Q2-release.
Change-Id: Ie42d9d757b41c0371d25f1c5440765d41f1028ad
2024-05-14 17:40:13 +00:00
Wayne Lin
0f2956f77c gps: update gps configuration
disable requestRefLocCb to prevent incorrect cell info

Bug: 339411438
Test: Config change works
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a2e75c43556bc2dc38c5fc840e2fd3b323080d17)
Merged-In: I280adb0de6001b437a023506d67d8c858508944d
Change-Id: I280adb0de6001b437a023506d67d8c858508944d
2024-05-14 17:38:19 +00:00
Shin-Yu Wang
5da22b6e6d Update the idle timer setting
Bug: 337823087
Test: adb shell getprop | grep set_idle_timer_ms
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b50cdb7c7351d2d7e1cf1f6d4ee7bfbdd8ae7c17)
Merged-In: I3c429fb5b476b4023b0bbe6174b096cf61dbf8cc
Change-Id: I3c429fb5b476b4023b0bbe6174b096cf61dbf8cc
2024-05-14 17:38:04 +00:00
Treehugger Robot
a0f2e941ae Merge "Update the idle timer setting" into main 2024-05-14 09:51:45 +00:00
Shin-Yu Wang
b50cdb7c73 Update the idle timer setting
Bug: 337823087
Test: adb shell getprop | grep set_idle_timer_ms
Change-Id: I3c429fb5b476b4023b0bbe6174b096cf61dbf8cc
2024-05-14 08:42:48 +00:00
Carter Hsu
1465824c62 Merge "audio: enable safe media volume for US" into main 2024-05-09 01:23:52 +00:00
Cheng Chang
c6add0f92e gps: Merge akita pixel-gnss mk to vendor folder
Bug: 332204989
Test: Health boot check at b/332204989#comment36
Test: Verification test at b/332204989
Change-Id: I74d16be8e04b99b8a765955ca330799149db9d2b
2024-05-07 09:45:19 +00:00
Xin Li
434cde7a85 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I4dbca2b8e90af67ce064c0a1e82807636b7c76a8
Change-Id: Id072cbd8323fc9b04b5ce1f3986f9e44e51f1624
2024-05-06 12:09:14 -07:00
Cyan_Hsieh
3f280cf422 Update bootloader pdk folder and soong config
Bug: 333834221
Change-Id: I092c42eb89d6afcdaf2797118ea5fe28fbd3a984
2024-05-06 16:40:31 +08:00
Edwin Tung
cf048bff49 gps: update gps configuration
disable requestRefLocCb to prevent incorrect cell info
re-enabling OTDOA

Bug: 336760721
Bug: 329779403

Test: Config change works
Change-Id: Ia92f06403c11dd04776be768b5087526b589ffb3
2024-05-03 08:48:05 +00:00
Qian-Hao Huang
7afe66f80d Load fips140.ko before all other kernel modules
Bug: 337838109
Bug: 331791671
Change-Id: I65c3fde7fd179b506a5a2eea45b7c2ef7a7fa956
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-05-02 13:17:13 +00:00
Carter Hsu
c96fa57cfc audio: enable safe media volume for US
Bug: 337063847
Test: build pass
Change-Id: I2f5f824f00d1133d387b1fa8bc1e620a43ada07e
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-05-02 03:18:29 +00:00
Treehugger Robot
a81a7fe882 Merge "Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp." into main 2024-04-30 05:37:46 +00:00
Treehugger Robot
380ac57aaf Merge "Add system property for concurrent encryption on LE and BR/EDR" into main 2024-04-30 02:00:49 +00:00
Carter Hsu
e174b5d285 audio: remove unused device
Bug: 337191827
Test: build pass
Change-Id: I9e3b01866d78562f6cc63cea8ba6d9d580d89f70
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-04-27 02:10:30 +08:00
Ankur Bakshi
f739c25468 Merge "Update Akita SVN to 10" into main 2024-04-26 12:43:59 +00:00
Nelson Li
3d903d28ad Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp.
p23_common includes 4 devices: `ripcurrent`, `shiba`, `husky`, and
`akita`.

Since `preloaded_nanoapps.json` has different configurations for
`factory` products and `non-factory` products, `soong_namespace {}`
needs to be added to the converted Android.bp file to avoid misuse.

Additionally, due to ag/27008138, ag/27046793, ag/27008143, and
ag/27056982, a common inheritance layer has been added to all
`non-factory` products. Therefore, setting different
`PRODUCT_SOONG_NAMESPACES` in the corresponding `<DEVICE>_generic.mk`
and `factory_<DEVICE>.mk` files will allow factory products and
non-factory products to use different preloaded_nanoapps.json.

Bug: 332219400
Test: 1. lunch <device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      2. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the <device_name> version.
      3. lunch factory_<device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      4. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the factory version.
Change-Id: Ib33c71773617f7a20b3af982f6140f8f8da0ced4
2024-04-26 06:36:07 +00:00
Thomas Girardier
ef8eac078c Merge "Revert "[BT] Disable BT auto on"" into main 2024-04-26 04:02:59 +00:00
Treehugger Robot
972879ad9b Merge "Refactor product inheritance for akita products" into main 2024-04-26 04:02:19 +00:00
Treehugger Robot
98c88426bf Merge "Adpf:akita: revert heuristic boost triggering condition." into main 2024-04-26 02:42:19 +00:00
Nelson Li
b518294be1 Refactor product inheritance for akita products
Add an additional layer of inheritance for `aosp_akita`, and
`aosp_akita_fullmte`.

This change adds a common layer of inheritance (akita_generic.mk)
for non-factory products. This makes it easier to configure factory
and non-factory products differently.

Non-factory `akita` products now inherits from
`device/google/akita/akita_generic.mk` which inherit from
`device/google/akita/device-akita.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 332219400
Bug: 335565718
Test: lunch aosp_akita-trunk_staging-userdebug && m
      lunch aosp_akita_fullmte-trunk_staging-userdebug && m

Change-Id: Id98e494f8262e0dfe76349369d2e5c0c34eaaa2b
2024-04-26 02:36:28 +00:00
guibing
1dc6a9f589 Adpf:akita: revert heuristic boost triggering condition.
This reverts previous JankCheckTimeFactor from 1.43 to 1.2.

Since the current reported duration doesn't include the GPU
part, the JankCheckTimeFactor needs to be smaller for matching
jank frame detection.

Bug: 204204746
Test: adb shell dumpsys android.hardware.power.Ipower/default;
      check adpf sessions' traces.
Change-Id: Ia90372cf08ddc31bfa527553b81e78084ac73f48
2024-04-25 22:51:37 +00:00