Commit graph

396 commits

Author SHA1 Message Date
Xin Li
64e598ce2b Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I53a278f1317f5307441103dc42dc5be6f20d7075
Change-Id: I3a53ebf7339cdb886d3c1b733b8eee1847f8832a
2024-05-24 08:28:04 -07:00
David Anderson
b6e6f3bfec Annotate Health HAL test for VSR.
Bug: 310198142
Test: N/A
Change-Id: I4562c1f09cd5f32f528b74ed98e3a3a5cd733688
2024-03-29 11:45:31 -07:00
Devin Moore
a8efdb127e Vendor API level 202404 is now frozen
Ignore-AOSP-First: VINTF 202404 Finalization
Bug: 279809333
Test: build
Change-Id: Ie6d38d27a287e258c30516e0030ad8c931d06432
2024-02-20 21:05:23 +00:00
Xin Li
763c473c3d Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I976f80006aeb88bde2ae34ca4f9be72cea727d9e
Change-Id: Id94b25af52bd2e2847b6858697ab21cc6ce27aa3
2024-01-30 10:36:50 -08:00
Devin Moore
92f705cee5 Use onUnlinked in health HAL
It's possible to get an onBinderDied callback after a call to
AIBinder_unlinkToDeath() so we can't delete the objects in callbacks_
until we are done using the void* cookie.
Handling the cleanup in onBinderUnlinked will handle the case where we
manually unlink it as well as the case where it's unlinked due to death.

Test: atest VtsHalHealthTargetTest
Bug: 319210610
Change-Id: Iee4783217cc88134af6de0fe66128684ca984dba
2024-01-25 00:17:47 +00:00
Treehugger Robot
2f66667556 Merge "Remove the active deletion action of callbacks" into main am: 2734d2f2bb am: 288f14e354
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2730951

Change-Id: I16dad9ef335ce966e9ddcd8c5e4f4bcfcd2c4ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-22 11:02:41 +00:00
Treehugger Robot
2734d2f2bb Merge "Remove the active deletion action of callbacks" into main 2024-01-22 10:03:12 +00:00
Yifan Hong
979995a0df Merge "health: OWNERS -elsk +dvander." into main am: 5ee7a66ee7 am: 54f12450e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2912229

Change-Id: I30f6009dfa75f669784eb64281c78638738fa807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 21:21:48 +00:00
Yifan Hong
4cab108176 health: OWNERS -elsk +dvander.
Test: N/A
Change-Id: I8f5b3baf649c85a0af8c6c935ea1e847c08afea9
2024-01-17 10:49:07 -08:00
Treehugger Robot
16c0974ba5 Merge "health: Remove 2.0 HAL implementation." into main am: 7535e95430 am: f83c22ec72 am: dcf1d6889e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2815768

Change-Id: I3c7a3539b4926976e3d689a5ae7a6accbc115d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-09 01:32:34 +00:00
Treehugger Robot
7535e95430 Merge "health: Remove 2.0 HAL implementation." into main 2024-01-09 00:28:28 +00:00
David Anderson
f213e177fd Merge "health: Query new properties from BatteryMonitor." into main am: c601ec2ff5 am: e62ba8d5ba am: 0748629366
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865639

Change-Id: I6a021d6b7af3548859eac0ed4398ef823e0931b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 21:47:44 +00:00
David Anderson
6e367dd86f Merge "Add android.hardware.health AIDL HAL V3." into main am: 9315c9f499 am: 346f8587c6 am: eb6c88c9d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2836453

Change-Id: I4a3578173a7d6a59d73f4acd6b84088358c1e0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:43:39 +00:00
David Anderson
8b413eb4ab health: Query new properties from BatteryMonitor.
Bug: 309792384
Test: VtsHealthTargetTest
Change-Id: I3e0117cf0e98b4861ede92623994877374cd2e23
2023-12-11 11:01:52 -08:00
David Anderson
85b3b0321a Add android.hardware.health AIDL HAL V3.
Bug: 309792384
Test: m
Change-Id: I5e9183b840f523f4d5b81dec813d35983882f71d
2023-12-11 11:01:52 -08:00
Yifan Hong
06343d55fe health: Remove 2.0 HAL implementation.
Remove HIDL 2.0 service implementation and unused
helper libraries.

Test: TH
Bug: 308450739
Change-Id: I8e1eb743d978315ae9b5b516d3e2e9dc6151d2c2
2023-11-02 13:42:21 -07:00
Treehugger Robot
2d67b6d140 Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 am: 69f5242fba am: bd44ec07a2 am: 4d79351da6 am: e23e5c94bb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: Id918272405a3ceb1f10574c401cb1c60dbbe3a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 23:26:00 +00:00
Treehugger Robot
69f5242fba Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: I1c913e1f157c5270904b2d92d729b85977b5189d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 19:15:18 +00:00
Tomasz Wasilczyk
4f5fdf09a9 Don't depend on String8 cast to C string [health]
Bug: 295394788
Test: m checkbuild
Change-Id: I67f0468dc21dfb0baab58361078f4f7bc750bdbd
2023-09-13 04:25:40 +00:00
Treehugger Robot
2e0e3c182e Merge "Split out health.storage OWNERS file" into main am: 5a3ecbaaf6 am: 3d5c48819a am: 21b1364d18 am: 15bb1243d7 am: fed4223aec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2747143

Change-Id: Ibc2a29b9f282f6e61e93ad7fe60becbd11bcd6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:26:07 +00:00
Treehugger Robot
1f6f9d56c7 Merge "Merge OWNERS files for health" into main am: a2a5939168 am: 6fca0ecdec am: ed2de1b455 am: d8b6194c9d am: 68f7d7b1a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746942

Change-Id: Ib968ca3c73f17836bd1b50f033fd31f0ccc69e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:24:15 +00:00
Treehugger Robot
3d5c48819a Merge "Split out health.storage OWNERS file" into main am: 5a3ecbaaf6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2747143

Change-Id: Icda20bc02328cb60e0356b59e1aba84273504d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:59:36 +00:00
Treehugger Robot
6fca0ecdec Merge "Merge OWNERS files for health" into main am: a2a5939168
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746942

Change-Id: Ifc1af121db0c6e6fd15161f9745268a525dbe2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:56:21 +00:00
Devin Moore
0fe0782761 Split out health.storage OWNERS file
Test: none
Bug: 296950573
Change-Id: Ib91206406a35cc76d228d6351dcc785cb3d00002
2023-09-11 17:36:30 +00:00
Devin Moore
4d235eed2b Merge OWNERS files for health
Test: none
Bug: 296950573
Change-Id: I568017d621f9c539ab53c9fc48cf5f5844126f24
2023-09-08 21:22:23 +00:00
Hang Lu
cef01a32a1 Remove the active deletion action of callbacks
The active deletion action will cause binder blocked in some corner
cases. As serviceDied will take care of its deletion, remove the active
deletion has no side effect and could fix the issue.

Test: none
Bug: 296817256
Change-Id: Ib30b3910202e6bbd86ac59e0e69fbeb0a890dd38
2023-09-04 10:52:04 +08:00
Tomasz Wasilczyk
cd82d3c09e Merge "Use String8/16 c_str [health]" into main am: e76430d6f8 am: abb05b95e3 am: 06ba49fe3e am: c3c5e77b54 am: 211ab3c6fa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727996

Change-Id: I37b33064bc56e08c16b3229d333237e74745018d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 01:41:52 +00:00
Treehugger Robot
a152e2987a Merge "Move OWNERS from health aidl HAL to general health folder" into main am: 8d9bd17981 am: 142866d7be am: 0b875483ee am: ae5edaecd1 am: 7462d36071
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2731254

Change-Id: I41fb256e840514916911ef427a88a591bc2e6bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 01:40:24 +00:00
Tomasz Wasilczyk
abb05b95e3 Merge "Use String8/16 c_str [health]" into main am: e76430d6f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727996

Change-Id: I4e389c3a74abfbcc992d45ce3241bf7a5284aad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 22:26:26 +00:00
Treehugger Robot
142866d7be Merge "Move OWNERS from health aidl HAL to general health folder" into main am: 8d9bd17981
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2731254

Change-Id: I174e3ff139dd6545b52a9629fcd98ecd1ebf3455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 22:25:27 +00:00
Tomasz Wasilczyk
e76430d6f8 Merge "Use String8/16 c_str [health]" into main 2023-08-29 22:02:56 +00:00
Tomasz Wasilczyk
4336fc5995 Move OWNERS from health aidl HAL to general health folder
Test: N/A
Change-Id: I01d4b52042d4f9f7b68898e83cb2058e9877a1f0
2023-08-29 21:11:05 +00:00
Xin Li
879960bdce Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Tomasz Wasilczyk
fcaba4b69c Use String8/16 c_str [health]
Bug: 295394788
Test: make checkbuild
Change-Id: I6671af787ca8c687d30d0db8dbb4f639157b5e81
2023-08-25 19:39:33 +00:00
Ryan Prichard
45d6657f8f Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea am: 073c14a320 am: ce87f3a63d am: bc5e1931d8 am: afa3d1a2cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342

Change-Id: Iaf5083189f9d9faf5f97b07bafc56d59a2750b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 00:35:13 +00:00
Ryan Prichard
ce87f3a63d Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea am: 073c14a320
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342

Change-Id: I6af09129d24876e8582ab2121512dd16b1ec3492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 22:12:55 +00:00
Ryan Prichard
c8fc80c47b Include <functional> for std::function and std::placeholders
Bug: b/175635923
Test: treehugger
Change-Id: I3dabb8c44334713be9e461dd81f437c3da1ea936
2023-07-21 16:18:11 -07:00
Treehugger Robot
da4428be6e Merge "health: Check return value of LinkedCallback::Make." into main am: af52e698da am: 30525c3b18 am: 390416afba am: 589e7010a5 am: 4d568fdbb9 am: 2613d6735a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651239

Change-Id: Ifee664f55dfce9f8a27b51fc3edea2e17f919c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 00:30:12 +00:00
Treehugger Robot
589e7010a5 Merge "health: Check return value of LinkedCallback::Make." into main am: af52e698da am: 30525c3b18 am: 390416afba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651239

Change-Id: I99052471e14938816eece12629492cc677edf450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 22:29:05 +00:00
Yifan Hong
70197263f0 health: Check return value of LinkedCallback::Make.
If LinkedCallback::Make returns nullptr, do not put it
in Health::callback_. Otherwise, OnHealthInfoChanged
crashes later because the linked callback objects are
not null checked before accessing.

Test: android.hardware.health-service.aidl_fuzzer (with
  a special corpus)
Fixes: 289599278
Change-Id: I8bad41dbcfbefeb54744059baffd4eef1ae7ec42
2023-07-06 17:46:25 -07:00
Yihan Dong
c03c2f3204 Create OWNERS for VtsHalHealthStorageTargetTest am: 36f5abe27c am: fa91cb1e25 am: ff4059824a am: 818d990a5e am: b5ab6e49a5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2566351

Change-Id: Idf7e0376244f3e107ebfd633484f96b6fee200ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 07:49:41 +00:00
Yihan Dong
818d990a5e Create OWNERS for VtsHalHealthStorageTargetTest am: 36f5abe27c am: fa91cb1e25 am: ff4059824a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2566351

Change-Id: I10e5143d9c5910ada1c96f50b18476fd6ec1f0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:02:00 +00:00
Yihan Dong
36f5abe27c Create OWNERS for VtsHalHealthStorageTargetTest
Bug: 278494006
Change-Id: I950548feb2673ba8f6c646a4916a4730ef6ce763
2023-04-27 09:11:30 +00:00
Kevin Jeon
0331772902 Add missing newline to health/wifi AIDL interfaces
This change adds a missing newline character to the end of dump() for
the default health and wifi int

Add missing newline to health/wifi AIDL interfaces

This change adds a missing newline character to the end of dump() for
health and wifi.

Test: Take a bugreport and verify that the "X was the duration of
      dumpsys Y" lines aren't preceded by the final line of the dump.
Test: Run "dumpsys android.hardware.health.IHealth/default" and verify
      that the new line exists.
Test: Run "dumpsys android.hardware.wifi.IWifi/default" and verify that
      the new line exists.
Bug: 278081288
Change-Id: I173dd174b5bab808c6296f7163982393e60ba0c6
2023-04-13 13:09:07 -04:00
Alex Buynytskyy
ec1198d941 UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Jack Wu
2d6557c0f7 health: fix vts setChargingPolicy failing
Bug: 274308314
Test: m android.hardware.health-update-api
Change-Id: I0f1a41d86d6998f061a29a51b9d1cf43a47949c2
Signed-off-by: Jack Wu <wjack@google.com>
2023-03-23 12:01:22 +00:00
Jack Wu
cbbf24f15d health: get batteryStateOfHealth from healthd
Bug: 251427118
Test: m android.hardware.health-update-api
Change-Id: I556570782b0a9698fd3530be86f8ede33b11afe2
Signed-off-by: Jack Wu <wjack@google.com>
2023-02-23 01:24:00 +00:00
AleX Pelosi
39c564112b health: batteryStateOfHealth should be a property
Move batteryStateOfHealth to HealthData

Bug: 251427118
Test: m android.hardware.health-update-api
Change-Id: I8835489f5c3d75ffc48e198a63eafc52b555ccd4
Signed-off-by: AleX Pelosi <apelosi@google.com>
2023-02-23 01:23:51 +00:00
AleX Pelosi
8a1f34f1b7 health: update owners
+apelosi

Bug: N/A
Test: N/A
Change-Id: Ia698145eda18b8a6e34e80303ac14524c036b1fe
Signed-off-by: AleX Pelosi <apelosi@google.com>
2023-02-17 13:19:32 +00:00
Yifan Hong
8bde9fedfc health: update owners.
-stayfan, +wjack

Test: N/A
Bug: N/A
Change-Id: I31f4f21efc30c90bc8e46567e7d08dfdabf717d1
2023-02-03 21:43:04 +00:00