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

Commit a733af84 authored by Xiang Wang's avatar Xiang Wang Committed by Android (Google) Code Review
Browse files

Merge "Update CPU GPU headroom HAL API" into main

parents fbb22abb b0d667e8
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -34,9 +34,10 @@
package android.hardware.power;
@JavaDerive(equals=true, toString=true) @VintfStability
parcelable CpuHeadroomParams {
  android.hardware.power.CpuHeadroomParams.CalculationType calculationType;
  android.hardware.power.CpuHeadroomParams.SelectionType selectionType;
  int pid;
  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,
+39 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.power;
@JavaDerive(equals=true, toString=true) @VintfStability
union CpuHeadroomResult {
  float globalHeadroom;
  float[] perCoreHeadroom;
}
+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@
package android.hardware.power;
@JavaDerive(equals=true, toString=true) @VintfStability
parcelable GpuHeadroomParams {
  android.hardware.power.GpuHeadroomParams.CalculationType calculationType;
  android.hardware.power.GpuHeadroomParams.CalculationType calculationType = android.hardware.power.GpuHeadroomParams.CalculationType.MIN;
  int calculationWindowMillis = 1000;
  enum CalculationType {
    MIN,
    AVERAGE,
+38 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.power;
@JavaDerive(equals=true, toString=true) @VintfStability
union GpuHeadroomResult {
  float globalHeadroom;
}
+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ interface IPower {
  android.hardware.power.ChannelConfig getSessionChannel(in int tgid, in int uid);
  oneway void closeSessionChannel(in int tgid, in int uid);
  android.hardware.power.SupportInfo getSupportInfo();
  float[] getCpuHeadroom(in android.hardware.power.CpuHeadroomParams params);
  float getGpuHeadroom(in android.hardware.power.GpuHeadroomParams params);
  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);
Loading