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

Commit 17520756 authored by Xiang Wang's avatar Xiang Wang
Browse files

Remove headroom selection type and move interval to support info 

Bug: 346604998
Flag: EXEMPT hal
Test: atest VtsHalPowerTargetTest
Change-Id: I8ee116b8e297349241917deb102a1a8cca3bfebe
parent 5dd455a5

power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/CpuHeadroomParams.aidl

+0 −5
Original line number Diff line number Diff line
@@ -36,14 +36,9 @@ package android.hardware.power; 
parcelable CpuHeadroomParams {

  android.hardware.power.CpuHeadroomParams.CalculationType calculationType = android.hardware.power.CpuHeadroomParams.CalculationType.MIN;

  int calculationWindowMillis = 1000;

  android.hardware.power.CpuHeadroomParams.SelectionType selectionType = android.hardware.power.CpuHeadroomParams.SelectionType.ALL;

  int[] tids;

  enum CalculationType {

    MIN,

    AVERAGE,

  }

  enum SelectionType {

    ALL,

    PER_CORE,

  }

}

power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/CpuHeadroomResult.aidl

+0 −1
Original line number Diff line number Diff line
@@ -35,5 +35,4 @@ package android.hardware.power; 
@JavaDerive(equals=true, toString=true) @VintfStability

union CpuHeadroomResult {

  float globalHeadroom;

  float[] perCoreHeadroom;

}

power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/IPower.aidl

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ interface IPower { 
  android.hardware.power.SupportInfo getSupportInfo();

  android.hardware.power.CpuHeadroomResult getCpuHeadroom(in android.hardware.power.CpuHeadroomParams params);

  android.hardware.power.GpuHeadroomResult getGpuHeadroom(in android.hardware.power.GpuHeadroomParams params);

  long getCpuHeadroomMinIntervalMillis();

  long getGpuHeadroomMinIntervalMillis();

  oneway void sendCompositionData(in android.hardware.power.CompositionData[] data);

  oneway void sendCompositionUpdate(in android.hardware.power.CompositionUpdate update);

}

power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/SupportInfo.aidl

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ parcelable SupportInfo { 
  long sessionModes;

  long sessionTags;

  android.hardware.power.SupportInfo.CompositionDataSupportInfo compositionData;

  android.hardware.power.SupportInfo.HeadroomSupportInfo headroom;

  @VintfStability

  parcelable CompositionDataSupportInfo {

    boolean isSupported;
@@ -48,4 +49,11 @@ parcelable SupportInfo { 
    int maxBatchSize;

    boolean alwaysBatch;

  }

  @VintfStability

  parcelable HeadroomSupportInfo {

    boolean isCpuSupported;

    boolean isGpuSupported;

    int cpuMinIntervalMillis;

    int gpuMinIntervalMillis;

  }

}

power/aidl/android/hardware/power/CpuHeadroomParams.aidl

+0 −15
Original line number Diff line number Diff line
@@ -41,21 +41,6 @@ parcelable CpuHeadroomParams { 
     */

    int calculationWindowMillis = 1000;



    /**

     * Defines how to select the CPU.

     */

    enum SelectionType {

        // Default to return a single value for all cores.

        ALL,

        // Returns per-core headroom in a list.

        PER_CORE,

    }



    /**

     * The CPU selection type.

     */

    SelectionType selectionType = SelectionType.ALL;



    /**

     * The thread TIDs to track.

     *