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

Commit defa31f2 authored by Vince Leung's avatar Vince Leung Committed by Automerger Merge Worker
Browse files

Merge "vibrator: aidl: Add get f0 and get Q APIs" into sc-dev am: 41794768 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13474108

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbb14523830b41100f98d6a7cfec66d17ab80528
parents 5f5026c6 41794768

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

+22 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

/*

 * Copyright (C) 2019 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 IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// edit this file. It looks like you are doing that because you have modified

// two cases:

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// 1). this is a frozen version file - do not edit this in any case.

// from an interface or a field from a parcelable and it broke the build. That

// 2). this is a 'current' file. If you make a backwards compatible change to

// breakage is intended.

//     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 changes to the AIDL files built

// 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

// 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

// 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

// independently updatable components of the system. If a device is shipped

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

+22 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

/*

 * Copyright (C) 2019 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 IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// edit this file. It looks like you are doing that because you have modified

// two cases:

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// 1). this is a frozen version file - do not edit this in any case.

// from an interface or a field from a parcelable and it broke the build. That

// 2). this is a 'current' file. If you make a backwards compatible change to

// breakage is intended.

//     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 changes to the AIDL files built

// 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

// 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

// 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

// independently updatable components of the system. If a device is shipped

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

+22 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

/*

 * Copyright (C) 2019 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 IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// edit this file. It looks like you are doing that because you have modified

// two cases:

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// 1). this is a frozen version file - do not edit this in any case.

// from an interface or a field from a parcelable and it broke the build. That

// 2). this is a 'current' file. If you make a backwards compatible change to

// breakage is intended.

//     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 changes to the AIDL files built

// 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

// 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

// 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

// independently updatable components of the system. If a device is shipped

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

+22 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

/*

 * Copyright (C) 2019 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 IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// edit this file. It looks like you are doing that because you have modified

// two cases:

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// 1). this is a frozen version file - do not edit this in any case.

// from an interface or a field from a parcelable and it broke the build. That

// 2). this is a 'current' file. If you make a backwards compatible change to

// breakage is intended.

//     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 changes to the AIDL files built

// 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

// 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

// 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

// independently updatable components of the system. If a device is shipped

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

+26 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

/*

 * Copyright (C) 2019 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 IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// edit this file. It looks like you are doing that because you have modified

// two cases:

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// 1). this is a frozen version file - do not edit this in any case.

// from an interface or a field from a parcelable and it broke the build. That

// 2). this is a 'current' file. If you make a backwards compatible change to

// breakage is intended.

//     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 changes to the AIDL files built

// 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

// 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

// 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

// independently updatable components of the system. If a device is shipped
@@ -33,6 +48,8 @@ interface IVibrator { 
  android.hardware.vibrator.Effect[] getSupportedAlwaysOnEffects();

  android.hardware.vibrator.Effect[] getSupportedAlwaysOnEffects();

  void alwaysOnEnable(in int id, in android.hardware.vibrator.Effect effect, in android.hardware.vibrator.EffectStrength strength);

  void alwaysOnEnable(in int id, in android.hardware.vibrator.Effect effect, in android.hardware.vibrator.EffectStrength strength);

  void alwaysOnDisable(in int id);

  void alwaysOnDisable(in int id);

  float getResonantFrequency();

  float getQFactor();

  const int CAP_ON_CALLBACK = 1;

  const int CAP_ON_CALLBACK = 1;

  const int CAP_PERFORM_CALLBACK = 2;

  const int CAP_PERFORM_CALLBACK = 2;

  const int CAP_AMPLITUDE_CONTROL = 4;

  const int CAP_AMPLITUDE_CONTROL = 4;
@@ -40,4 +57,6 @@ interface IVibrator { 
  const int CAP_EXTERNAL_AMPLITUDE_CONTROL = 16;

  const int CAP_EXTERNAL_AMPLITUDE_CONTROL = 16;

  const int CAP_COMPOSE_EFFECTS = 32;

  const int CAP_COMPOSE_EFFECTS = 32;

  const int CAP_ALWAYS_ON_CONTROL = 64;

  const int CAP_ALWAYS_ON_CONTROL = 64;

  const int CAP_GET_RESONANT_FREQUENCY = 128;

  const int CAP_GET_Q_FACTOR = 256;

}
 
}