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

Commit 5ece3aad authored by Shawn Willden's avatar Shawn Willden Committed by Android (Google) Code Review
Browse files

Merge "Add nullability annotations to ISecureElementService et al" into main

parents f52c236b b1a00f59

omapi/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -41,5 +41,5 @@ aidl_interface { 
            imports: [],

        },

    ],



    frozen: false,

}

omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementChannel.aidl

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021, The Android Open Source Project

 * Copyright (C) 2017, 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.
@@ -40,7 +40,7 @@ interface ISecureElementChannel { 
  void close();

  boolean isClosed();

  boolean isBasicChannel();

  byte[] getSelectResponse();

  @nullable byte[] getSelectResponse();

  byte[] transmit(in byte[] command);

  boolean selectNext();

}

omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -41,5 +41,5 @@ package android.se.omapi; 
interface ISecureElementService {

  String[] getReaders();

  android.se.omapi.ISecureElementReader getReader(in String reader);

  boolean[] isNfcEventAllowed(in String reader, in byte[] aid, in String[] packageNames, in int userId);

  @nullable boolean[] isNfcEventAllowed(in String reader, in @nullable byte[] aid, in @nullable String[] packageNames, in int userId);

}

omapi/aidl/aidl_api/android.se.omapi/current/android/se/omapi/ISecureElementSession.aidl

+3 −3
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ package android.se.omapi; 
/* @hide */

@VintfStability

interface ISecureElementSession {

  byte[] getAtr();

  @nullable byte[] getAtr();

  void close();

  void closeChannels();

  boolean isClosed();

  android.se.omapi.ISecureElementChannel openBasicChannel(in byte[] aid, in byte p2, in android.se.omapi.ISecureElementListener listener);

  android.se.omapi.ISecureElementChannel openLogicalChannel(in byte[] aid, in byte p2, in android.se.omapi.ISecureElementListener listener);

  @nullable android.se.omapi.ISecureElementChannel openBasicChannel(in @nullable byte[] aid, in byte p2, in android.se.omapi.ISecureElementListener listener);

  @nullable android.se.omapi.ISecureElementChannel openLogicalChannel(in @nullable byte[] aid, in byte p2, in android.se.omapi.ISecureElementListener listener);

}

omapi/aidl/android/se/omapi/ISecureElementChannel.aidl

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ interface ISecureElementChannel { 
     * bytes in the following order:

     * [<first data byte>, ..., <last data byte>, <sw1>, <sw2>]

     */

    byte[] getSelectResponse();

    @nullable byte[] getSelectResponse();



    /**

     * Transmits the specified command APDU and returns the response APDU.