tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add isHardwareIgnoringTouches to OperationContext" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-01-06 01:42:13 +00:00 committed by Android (Google) Code Review
commit 34b761ab51
6 changed files with 102 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/OperationContext.aidl
View file

@ -46,4 +46,5 @@ parcelable OperationContext {
android.hardware.biometrics.common.DisplayState displayState = android.hardware.biometrics.common.DisplayState.UNKNOWN;
@nullable android.hardware.biometrics.common.AuthenticateReason authenticateReason;
android.hardware.biometrics.common.FoldState foldState = android.hardware.biometrics.common.FoldState.UNKNOWN;
@nullable android.hardware.biometrics.common.OperationState operationState;
}

49
biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/OperationState.aidl Normal file
View file

@ -0,0 +1,49 @@
/*
* 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.biometrics.common;
/* @hide */
@VintfStability
union OperationState {
android.hardware.biometrics.common.OperationState.FingerprintOperationState fingerprintOperationState;
android.hardware.biometrics.common.OperationState.FaceOperationState faceOperationState;
@VintfStability
parcelable FingerprintOperationState {
ParcelableHolder extension;
boolean isHardwareIgnoringTouches = false;
}
@VintfStability
parcelable FaceOperationState {
ParcelableHolder extension;
}
}

4
biometrics/common/aidl/android/hardware/biometrics/common/OperationContext.aidl
View file

@ -20,6 +20,7 @@ import android.hardware.biometrics.common.AuthenticateReason;
import android.hardware.biometrics.common.DisplayState;
import android.hardware.biometrics.common.FoldState;
import android.hardware.biometrics.common.OperationReason;
import android.hardware.biometrics.common.OperationState;
import android.hardware.biometrics.common.WakeReason;
/**
@ -75,4 +76,7 @@ parcelable OperationContext {
/** The current fold/unfold state. */
FoldState foldState = FoldState.UNKNOWN;
/** An associated operation state for this operation. */
@nullable OperationState operationState;
}

43
biometrics/common/aidl/android/hardware/biometrics/common/OperationState.aidl Normal file
View file

@ -0,0 +1,43 @@
/*
* 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.biometrics.common;
/**
* Additional state associated with an operation
*
* @hide
*/
@VintfStability
union OperationState {
/** Operation state related to fingerprint*/
@VintfStability
parcelable FingerprintOperationState {
ParcelableHolder extension;
/** Flag indicating if the HAL should ignore touches on the fingerprint sensor */
boolean isHardwareIgnoringTouches = false;
}
/** Operation state related to face*/
@VintfStability
parcelable FaceOperationState {
ParcelableHolder extension;
}
OperationState.FingerprintOperationState fingerprintOperationState;
OperationState.FaceOperationState faceOperationState;
}

3
biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISession.aidl
View file

@ -62,5 +62,8 @@ interface ISession {
void onPointerUpWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);
void onContextChanged(in android.hardware.biometrics.common.OperationContext context);
void onPointerCancelWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);
/**
* @deprecated use isHardwareIgnoringTouches in OperationContext from onContextChanged instead
*/
void setIgnoreDisplayTouches(in boolean shouldIgnore);
}

2
biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISession.aidl
View file

@ -544,6 +544,8 @@ interface ISession {
* whenever it's appropriate.
*
* @param shouldIgnore whether the display touches should be ignored.
* @deprecated use isHardwareIgnoringTouches in OperationContext from onContextChanged instead
*/
void setIgnoreDisplayTouches(in boolean shouldIgnore);
}