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

Commit 895ed3ef authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Move ICancellationSignal to common, add supportsNavigationGestures"

parents e453d81d e33abd64

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ICancellationSignal.aidl→biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/ICancellationSignal.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
// with such a backward incompatible change, it has a high risk of breaking

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.biometrics.fingerprint;

package android.hardware.biometrics.common;

@VintfStability

@VintfStability

interface ICancellationSignal {

interface ICancellationSignal {

  oneway void cancel();

  oneway void cancel();

biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ICancellationSignal.aidl→biometrics/common/aidl/android/hardware/biometrics/common/ICancellationSignal.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package android.hardware.biometrics.fingerprint;

package android.hardware.biometrics.common;





@VintfStability

@VintfStability

oneway interface ICancellationSignal {

oneway interface ICancellationSignal {

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISession.aidl

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ 
package android.hardware.biometrics.fingerprint;

package android.hardware.biometrics.fingerprint;

@VintfStability

@VintfStability

interface ISession {

interface ISession {

  android.hardware.biometrics.fingerprint.ICancellationSignal enroll(in int cookie, in android.hardware.keymaster.HardwareAuthToken hat);

  android.hardware.biometrics.common.ICancellationSignal enroll(in int cookie, in android.hardware.keymaster.HardwareAuthToken hat);

  android.hardware.biometrics.fingerprint.ICancellationSignal authenticate(in int cookie, in long keystoreOperationId);

  android.hardware.biometrics.common.ICancellationSignal authenticate(in int cookie, in long keystoreOperationId);

  android.hardware.biometrics.fingerprint.ICancellationSignal detectInteraction(in int cookie);

  android.hardware.biometrics.common.ICancellationSignal detectInteraction(in int cookie);

  void enumerateEnrollments(in int cookie);

  void enumerateEnrollments(in int cookie);

  void removeEnrollments(in int cookie, in int[] enrollmentIds);

  void removeEnrollments(in int cookie, in int[] enrollmentIds);

  void getAuthenticatorId(in int cookie);

  void getAuthenticatorId(in int cookie);

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/SensorProps.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ package android.hardware.biometrics.fingerprint; 
parcelable SensorProps {

parcelable SensorProps {

  android.hardware.biometrics.common.CommonProps commonProps;

  android.hardware.biometrics.common.CommonProps commonProps;

  android.hardware.biometrics.fingerprint.FingerprintSensorType sensorType;

  android.hardware.biometrics.fingerprint.FingerprintSensorType sensorType;

  boolean supportsNavigationGestures;

  int sensorLocationX;

  int sensorLocationX;

  int sensorLocationY;

  int sensorLocationY;

  int sensorRadius;

  int sensorRadius;

biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISession.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package android.hardware.biometrics.fingerprint;

package android.hardware.biometrics.fingerprint;





import android.hardware.biometrics.fingerprint.ICancellationSignal;

import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.keymaster.HardwareAuthToken;

import android.hardware.keymaster.HardwareAuthToken;





@VintfStability

@VintfStability