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

Commit 4e79fe7d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Fix API checking for some 

Using AIDL constants in the definition of public API static ints seems
to confuse build tools sometimes.  Switch to just duplicating the
constants until that's worked out.

Test: Builds, at least for me!
Change-Id: I0fbe95bc0492eb8b39687f25a6c7e073fbb65dc4
parent 2ad15fd1

core/java/android/hardware/camera2/CameraDevice.java

+3 −3
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ public abstract class CameraDevice implements AutoCloseable { 
    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_NORMAL =

            ICameraDeviceUser.NORMAL_MODE;

            0; // ICameraDeviceUser.NORMAL_MODE;



    /**

     * Constrained high-speed operation mode.
@@ -742,7 +742,7 @@ public abstract class CameraDevice implements AutoCloseable { 
    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED =

            ICameraDeviceUser.CONSTRAINED_HIGH_SPEED_MODE;

            1; // ICameraDeviceUser.CONSTRAINED_HIGH_SPEED_MODE;



    /**

     * First vendor-specific operating mode
@@ -753,7 +753,7 @@ public abstract class CameraDevice implements AutoCloseable { 
    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_VENDOR_START =

            ICameraDeviceUser.VENDOR_MODE_START;

            0x8000; // ICameraDeviceUser.VENDOR_MODE_START;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)