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

Commit 37c11b04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix API feedback on AuthenticatedKeyMetadata" am: 506f1e6e am: c21d08a9 am: cb270894 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2350224



Change-Id: Ie72c03069cdec0791719efe27b550cddd08d7f50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 615bfe78 cb270894

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -38278,7 +38278,7 @@ package android.security.identity { 
    ctor public AlreadyPersonalizedException(@NonNull String, @NonNull Throwable);

  }













  public class AuthenticationKeyMetadata {













  public final class AuthenticationKeyMetadata {















    method @NonNull public java.time.Instant getExpirationDate();















    method @IntRange(from=0) public int getUsageCount();















  }

























identity/java/android/security/identity/AuthenticationKeyMetadata.java



+3
−3




























Original line number
Diff line number
Diff line















/*













 * Copyright 2019 The Android Open Source Project













 * Copyright 2022 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.









@@ -24,11 +24,11 @@ import java.time.Instant;













/**















 * Data about authentication keys.















 */













public class AuthenticationKeyMetadata {













public final class AuthenticationKeyMetadata {















    private int mUsageCount;















    private Instant mExpirationDate;





























    AuthenticationKeyMetadata(int usageCount, Instant expirationDate) {













    AuthenticationKeyMetadata(int usageCount, @NonNull Instant expirationDate) {















        mUsageCount = usageCount;















        mExpirationDate = expirationDate;















    }