From 23fc5c8d575ef364941e60024780147d9a4a97bc Mon Sep 17 00:00:00 2001
From: Seth Moore <sethmo@google.com>
Date: Tue, 13 Dec 2022 10:08:54 -0800
Subject: [PATCH] Fix API feedback on AuthenticatedKeyMetadata

Make class final.
Add @NonNull annotation to ctor param

Fixes: 262381995
Test: atest android.security.identity.cts
Change-Id: Icae24f120090ec03e532ffdf139513a1cb852c80
---
 core/api/current.txt                                        | 2 +-
 .../security/identity/AuthenticationKeyMetadata.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 5cea1592cecca..85e9a161d09ac 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -37652,7 +37652,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();
   }
diff --git a/identity/java/android/security/identity/AuthenticationKeyMetadata.java b/identity/java/android/security/identity/AuthenticationKeyMetadata.java
index d4c28f8d459af..c6abc22c305f1 100644
--- a/identity/java/android/security/identity/AuthenticationKeyMetadata.java
+++ b/identity/java/android/security/identity/AuthenticationKeyMetadata.java
@@ -1,5 +1,5 @@
 /*
- * 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;
     }