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

Commit b5956e34 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Add display state and authenticate reason to biometric AIDL interface."... 

Merge "Add display state and authenticate reason to biometric AIDL interface." into udc-dev am: d9b50c50

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



Change-Id: Ida681a084b7f7dd1cf1ad29928ac4c7e7539ca8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd060b7a d9b50c50

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/AuthenticateReason.aidl

0 → 100644
+63 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 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.biometrics.common;

/* @hide */

@VintfStability

union AuthenticateReason {

  android.hardware.biometrics.common.AuthenticateReason.Vendor vendorAuthenticateReason;

  android.hardware.biometrics.common.AuthenticateReason.Face faceAuthenticateReason;

  android.hardware.biometrics.common.AuthenticateReason.Fingerprint fingerprintAuthenticateReason;

  @VintfStability

  parcelable Vendor {

    ParcelableHolder extension;

  }

  @Backing(type="int") @VintfStability

  enum Fingerprint {

    UNKNOWN,

  }

  @Backing(type="int") @VintfStability

  enum Face {

    UNKNOWN,

    STARTED_WAKING_UP,

    PRIMARY_BOUNCER_SHOWN,

    ASSISTANT_VISIBLE,

    ALTERNATE_BIOMETRIC_BOUNCER_SHOWN,

    NOTIFICATION_PANEL_CLICKED,

    OCCLUDING_APP_REQUESTED,

    PICK_UP_GESTURE_TRIGGERED,

    QS_EXPANDED,

    SWIPE_UP_ON_BOUNCER,

    UDFPS_POINTER_DOWN,

  }

}

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/DisplayState.aidl

0 → 100644
+43 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 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.biometrics.common;

/* @hide */

@Backing(type="int") @VintfStability

enum DisplayState {

  UNKNOWN,

  LOCKSCREEN,

  NO_UI,

  SCREENSAVER,

  AOD,

}

biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/OperationContext.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -37,7 +37,12 @@ package android.hardware.biometrics.common; 
parcelable OperationContext {

parcelable OperationContext {

  int id = 0;

  int id = 0;

  android.hardware.biometrics.common.OperationReason reason = android.hardware.biometrics.common.OperationReason.UNKNOWN;

  android.hardware.biometrics.common.OperationReason reason = android.hardware.biometrics.common.OperationReason.UNKNOWN;

  /**

   * @deprecated use displayState instead.

   */

  boolean isAod = false;

  boolean isAod = false;

  boolean isCrypto = false;

  boolean isCrypto = false;

  android.hardware.biometrics.common.WakeReason wakeReason = android.hardware.biometrics.common.WakeReason.UNKNOWN;

  android.hardware.biometrics.common.WakeReason wakeReason = android.hardware.biometrics.common.WakeReason.UNKNOWN;

  android.hardware.biometrics.common.DisplayState displayState = android.hardware.biometrics.common.DisplayState.UNKNOWN;

  @nullable android.hardware.biometrics.common.AuthenticateReason authenticateReason;

}
 
}

biometrics/common/aidl/android/hardware/biometrics/common/AuthenticateReason.aidl

0 → 100644
+59 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 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.biometrics.common;



/**

 * Reason for an authenticate operation.

 *

 * @hide

 */

@VintfStability

union AuthenticateReason {

    /** Vendor reason for invoking an authenticate operation. */

    @VintfStability

    parcelable Vendor {

        ParcelableHolder extension;

    }



    /** Reason for invoking fingerprint authentication. */

    @VintfStability

    @Backing(type="int")

    enum Fingerprint {

        UNKNOWN,

    }



    /** Reason for invoking face authentication. */

    @VintfStability

    @Backing(type="int")

    enum Face {

        UNKNOWN,

        STARTED_WAKING_UP,

        PRIMARY_BOUNCER_SHOWN,

        ASSISTANT_VISIBLE,

        ALTERNATE_BIOMETRIC_BOUNCER_SHOWN,

        NOTIFICATION_PANEL_CLICKED,

        OCCLUDING_APP_REQUESTED,

        PICK_UP_GESTURE_TRIGGERED,

        QS_EXPANDED,

        SWIPE_UP_ON_BOUNCER,

        UDFPS_POINTER_DOWN,

    }



    AuthenticateReason.Vendor vendorAuthenticateReason;

    AuthenticateReason.Face faceAuthenticateReason;

    AuthenticateReason.Fingerprint fingerprintAuthenticateReason;

}

biometrics/common/aidl/android/hardware/biometrics/common/DisplayState.aidl

0 → 100644
+41 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 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.biometrics.common;



/**

 * Display state during an operation.

 *

 * @hide

 */

@VintfStability

@Backing(type="int")

enum DisplayState {

    /** The display state is unknown. */

    UNKNOWN,



    /** The display is on and showing the lockscreen (or an occluding app). */

    LOCKSCREEN,



    /** The display is off or dozing. */

    NO_UI,



    /** The display is showing a screensaver (dreaming). */

    SCREENSAVER,



    /** The display is dreaming with always on display. */

    AOD,

}