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

Commit a3cc4931 authored by Devin Moore's avatar Devin Moore
Browse files

Remove placeholder API from camera.provider 

This API was added to work around an AIDL versioning issue that has now
been fixed.
The changed imports now count as a change to the interface, so this
placeholder API is no longer needed.

Test: m
bug: 237048744
Change-Id: I6c3edb156435b5d66578fe8250716333e0f54d6e
parent 68d3f128

camera/provider/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ aidl_interface { 
        "android.hardware.camera.device-V2",

        "android.hardware.camera.common-V1",

    ],

    frozen: false,

    stability: "vintf",

    backend: {

        java: {

camera/provider/aidl/aidl_api/android.hardware.camera.provider/current/android/hardware/camera/provider/ICameraProvider.aidl

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ interface ICameraProvider { 
  void notifyDeviceStateChange(long deviceState);

  android.hardware.camera.provider.ConcurrentCameraIdCombination[] getConcurrentCameraIds();

  boolean isConcurrentStreamCombinationSupported(in android.hardware.camera.provider.CameraIdAndStreamCombination[] configs);

  void placeholder();

  const long DEVICE_STATE_NORMAL = 0;

  const long DEVICE_STATE_BACK_COVERED = 1;

  const long DEVICE_STATE_FRONT_COVERED = 2;

camera/provider/aidl/android/hardware/camera/provider/ICameraProvider.aidl

+0 −8
Original line number Diff line number Diff line
@@ -304,12 +304,4 @@ interface ICameraProvider { 
     *

     */

    boolean isConcurrentStreamCombinationSupported(in CameraIdAndStreamCombination[] configs);



    /*

     * Due to a bug in vintf regarding aidl changes that are contained to fields,

     * we need a placeholder method that will be removed after this patch.

     *

     * TODO(b/237048744): Remove this once fixed.

     */

    void placeholder();

}