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

Commit 77e54da1 authored by David Zeuthen's avatar David Zeuthen Committed by Automerger Merge Worker
Browse files

Merge "identity: Add multi-document presentation support." am: 2e182eaf am:... 

Merge "identity: Add multi-document presentation support." am: 2e182eaf am: 0e7c06f8 am: 86b0e740

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

Change-Id: If8814639767a7ec71879f8a87af46e6297d31525
parents ffacdad4 86b0e740

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.identity</name>

        <version>1-3</version>

        <version>1-4</version>

        <interface>

            <name>IIdentityCredentialStore</name>

            <instance>default</instance>

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/Certificate.aidl

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * 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.                          //

///////////////////////////////////////////////////////////////////////////////

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/CipherSuite.aidl

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * 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.                          //

///////////////////////////////////////////////////////////////////////////////

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/HardwareInformation.aidl

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * 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.                          //

///////////////////////////////////////////////////////////////////////////////

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/IIdentityCredential.aidl

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * 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.                          //

///////////////////////////////////////////////////////////////////////////////