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

Commit bb669e19 authored by Ahmad Khalil's avatar Ahmad Khalil
Browse files

Modify composePwleV2 parameters and getPwleV2FrequencyToOutputAccelerationMap dependency 

 A new Parcelable type, `CompositePwle`, is added to encapsulate the array of primitives used to create the PWLE. `composePwleV2` API will now take a `CompositePwle` object as one of its parameters. This change improves API flexibility and makes it easier to add support for additional PWLE parameters in the future.

Also, `getPwleV2FrequencyToOutputAccelerationMap` method is modified to depend on the frequency control capability. This ensures that OEMs can support this api (which is used to create frequency profiles) without requiring support for Normalized PWLEs.

Bug: 347034419
Flag: EXEMPT HAL interface change
Test: vts-tradefed run vts -m VtsHalVibratorTargetTest
Change-Id: I07f3365ab5a87f3afbb1c537528094481b08986c
parent 85edd4dd

vibrator/aidl/aidl_api/android.hardware.vibrator/current/android/hardware/vibrator/CompositePwleV2.aidl

0 → 100644
+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.vibrator;

@VintfStability

parcelable CompositePwleV2 {

  android.hardware.vibrator.PwleV2Primitive[] pwlePrimitives;

}

vibrator/aidl/aidl_api/android.hardware.vibrator/current/android/hardware/vibrator/PwleV2OutputMapEntry.aidl→vibrator/aidl/aidl_api/android.hardware.vibrator/current/android/hardware/vibrator/FrequencyAccelerationMapEntry.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.vibrator;

@VintfStability

parcelable PwleV2OutputMapEntry {

parcelable FrequencyAccelerationMapEntry {

  float frequencyHz;

  float maxOutputAccelerationGs;

}

vibrator/aidl/aidl_api/android.hardware.vibrator/current/android/hardware/vibrator/IVibrator.aidl

+23 −2
Original line number Diff line number Diff line
@@ -51,19 +51,40 @@ interface IVibrator { 
  void alwaysOnDisable(in int id);

  float getResonantFrequency();

  float getQFactor();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented even if CAP_FREQUENCY_CONTROL capability is reported.

   */

  float getFrequencyResolution();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented even if CAP_FREQUENCY_CONTROL capability is reported.

   */

  float getFrequencyMinimum();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented even if CAP_FREQUENCY_CONTROL capability is reported.

   */

  float[] getBandwidthAmplitudeMap();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented. Use `IVibrator.getPwleV2PrimitiveDurationMaxMillis` instead.

   */

  int getPwlePrimitiveDurationMax();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented. Use `IVibrator.getPwleV2CompositionSizeMax` instead.

   */

  int getPwleCompositionSizeMax();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented.

   */

  android.hardware.vibrator.Braking[] getSupportedBraking();

  /**

   * @deprecated This method is deprecated from AIDL v3 and is no longer required to be implemented. Use `IVibrator.composePwleV2` instead.

   */

  void composePwle(in android.hardware.vibrator.PrimitivePwle[] composite, in android.hardware.vibrator.IVibratorCallback callback);

  void performVendorEffect(in android.hardware.vibrator.VendorEffect vendorEffect, in android.hardware.vibrator.IVibratorCallback callback);

  List<android.hardware.vibrator.PwleV2OutputMapEntry> getPwleV2FrequencyToOutputAccelerationMap();

  List<android.hardware.vibrator.FrequencyAccelerationMapEntry> getFrequencyToOutputAccelerationMap();

  int getPwleV2PrimitiveDurationMaxMillis();

  int getPwleV2CompositionSizeMax();

  int getPwleV2PrimitiveDurationMinMillis();

  void composePwleV2(in android.hardware.vibrator.PwleV2Primitive[] composite, in android.hardware.vibrator.IVibratorCallback callback);

  void composePwleV2(in android.hardware.vibrator.CompositePwleV2 composite, in android.hardware.vibrator.IVibratorCallback callback);

  const int CAP_ON_CALLBACK = (1 << 0) /* 1 */;

  const int CAP_PERFORM_CALLBACK = (1 << 1) /* 2 */;

  const int CAP_AMPLITUDE_CONTROL = (1 << 2) /* 4 */;

vibrator/aidl/android/hardware/vibrator/CompositePwleV2.aidl

0 → 100644
+27 −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.

 */



package android.hardware.vibrator;



import android.hardware.vibrator.PwleV2Primitive;



@VintfStability

parcelable CompositePwleV2 {

    /**

     * An array of primitives that represents the PWLE effect

     */

    PwleV2Primitive[] pwlePrimitives;

}

vibrator/aidl/android/hardware/vibrator/PwleV2OutputMapEntry.aidl→vibrator/aidl/android/hardware/vibrator/FrequencyAccelerationMapEntry.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.hardware.vibrator;



@VintfStability

parcelable PwleV2OutputMapEntry {

parcelable FrequencyAccelerationMapEntry {

    /**

     * Absolute frequency point in the units of hertz

     *