Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58977725 authored by Matt Buckley's avatar Matt Buckley
Browse files

Update HintManager to use NDK backend 

- Update HintManager and its aidl types to use NDK backend
- Switch HintManager to using PowerHAL's WorkDuration
- Update SDK WorkDuration.java to no longer be parcelable,
    since it isn't being sent over binders anymore.
- Remove duplicate WorkDuration in powermanager in favor of PowerHAL's

Bug: 315894228
Test: atest HintManagerServiceTest
Test: atest PerformanceHintNativeTestCases
Test: atest PerformanceHintManagerTest
Change-Id: Ibc5a3aa96e73a225fce980811694ee02bdabb963
parent 511dd169

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -355,8 +355,11 @@ java_defaults { 
            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/biometrics/common/aidl",

            "hardware/interfaces/biometrics/fingerprint/aidl",

            "hardware/interfaces/common/aidl",

            "hardware/interfaces/common/fmq/aidl",

            "hardware/interfaces/graphics/common/aidl",

            "hardware/interfaces/keymaster/aidl",

            "hardware/interfaces/power/aidl",

            "system/hardware/interfaces/media/aidl",

        ],

    },

api/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -342,8 +342,11 @@ stubs_defaults { 
            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/biometrics/common/aidl",

            "hardware/interfaces/biometrics/fingerprint/aidl",

            "hardware/interfaces/common/aidl",

            "hardware/interfaces/common/fmq/aidl",

            "hardware/interfaces/graphics/common/aidl",

            "hardware/interfaces/keymaster/aidl",

            "hardware/interfaces/power/aidl",

            "system/hardware/interfaces/media/aidl",

        ],

    },

core/api/current.txt

+1 −4
Original line number Diff line number Diff line
@@ -34212,9 +34212,8 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.VIBRATE) public final void vibrate(@NonNull android.os.CombinedVibration, @Nullable android.os.VibrationAttributes);

  }













  @FlaggedApi("android.os.adpf_gpu_report_actual_work_duration") public final class WorkDuration implements android.os.Parcelable {













  @FlaggedApi("android.os.adpf_gpu_report_actual_work_duration") public final class WorkDuration {















    ctor public WorkDuration();













    method public int describeContents();















    method public long getActualCpuDurationNanos();















    method public long getActualGpuDurationNanos();















    method public long getActualTotalDurationNanos();









@@ -34223,8 +34222,6 @@ package android.os {













    method public void setActualGpuDurationNanos(long);















    method public void setActualTotalDurationNanos(long);















    method public void setWorkPeriodStartTimestampNanos(long);













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.os.WorkDuration> CREATOR;















  }





























  public class WorkSource implements android.os.Parcelable {

























core/java/Android.bp



+24
−2






























Original line number
Diff line number
Diff line








@@ -135,8 +135,6 @@ filegroup {













    srcs: [















        "android/os/Temperature.aidl",















        "android/os/CoolingDevice.aidl",













        "android/os/IHintManager.aidl",













        "android/os/IHintSession.aidl",















        "android/os/IThermalEventListener.aidl",















        "android/os/IThermalStatusListener.aidl",















        "android/os/IThermalService.aidl",









@@ -145,6 +143,30 @@ filegroup {













    ],















}





























aidl_interface {













    name: "android.os.hintmanager_aidl",













    srcs: [













        "android/os/IHintManager.aidl",













        "android/os/IHintSession.aidl",













    ],













    unstable: true,













    backend: {













        java: {













            sdk_version: "module_current",













            enabled: true,













        },













        cpp: {













            enabled: false,













        },













        ndk: {













            enabled: true,













        },













    },













    imports: [













        "android.hardware.power-V5",













    ],













}





























aidl_library {















    name: "ILogcatManagerService_aidl",















    srcs: ["android/os/logcat/ILogcatManagerService.aidl"],

































core/java/android/os/IHintSession.aidl



+1
−1






























Original line number
Diff line number
Diff line








@@ -17,7 +17,7 @@





























package android.os;





























import android.os.WorkDuration;













import android.hardware.power.WorkDuration;































/** {@hide} */















oneway interface IHintSession {