commit 35434353310162a9d8ac6d726a26e8260be10251
author Max Bires <jbires@google.com> Thu Feb 13 11:04:33 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 11:04:33 2025 -0800
tree ce6e54654f642dba41a4f0226141e575fd7915ed
parent 74a660a0f74a8f0316c1930ea0a7aeff660e178c
parent 27e87c669ad49d68f371be6b3dc93032bd716622

Merge "Remove unnecessary abstraction of classes." into main

keystore/java/android/security/GateKeeper.java

diff --git a/keystore/java/android/security/GateKeeper.java b/keystore/java/android/security/GateKeeper.java
index 464714f..c2792e1f 100644
--- a/keystore/java/android/security/GateKeeper.java
+++ b/keystore/java/android/security/GateKeeper.java
@@ -28,7 +28,7 @@
  *
  * @hide
  */
-public abstract class GateKeeper {
+public final class GateKeeper {
 
     public static final long INVALID_SECURE_USER_ID = 0;
 

keystore/java/android/security/keystore/ArrayUtils.java

diff --git a/keystore/java/android/security/keystore/ArrayUtils.java b/keystore/java/android/security/keystore/ArrayUtils.java
index f22b604..6472ca9 100644
--- a/keystore/java/android/security/keystore/ArrayUtils.java
+++ b/keystore/java/android/security/keystore/ArrayUtils.java
@@ -23,7 +23,7 @@
 /**
  * @hide
  */
-public abstract class ArrayUtils {
+public final class ArrayUtils {
     private ArrayUtils() {}
 
     public static String[] nullToEmpty(String[] array) {

keystore/java/android/security/keystore/Utils.java

diff --git a/keystore/java/android/security/keystore/Utils.java b/keystore/java/android/security/keystore/Utils.java
index e58b1cc..c38ce8e 100644
--- a/keystore/java/android/security/keystore/Utils.java
+++ b/keystore/java/android/security/keystore/Utils.java
@@ -23,7 +23,7 @@
  *
  * @hide
  */
-abstract class Utils {
+public final class Utils {
     private Utils() {}
 
     static Date cloneIfNotNull(Date value) {

keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java

diff --git a/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java b/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java
index 1394bd4..9d306ce 100644
--- a/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java
+++ b/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java
@@ -38,7 +38,9 @@
 /**
  * @hide
  */
-public abstract class KeyStore2ParameterUtils {
+public final class KeyStore2ParameterUtils {
+
+    private KeyStore2ParameterUtils() {}
 
     /**
      * This function constructs a {@link KeyParameter} expressing a boolean value.

keystore/java/android/security/keystore2/KeymasterUtils.java

diff --git a/keystore/java/android/security/keystore2/KeymasterUtils.java b/keystore/java/android/security/keystore2/KeymasterUtils.java
index 614e368..14ac532 100644
--- a/keystore/java/android/security/keystore2/KeymasterUtils.java
+++ b/keystore/java/android/security/keystore2/KeymasterUtils.java
@@ -30,7 +30,7 @@
 /**
  * @hide
  */
-public abstract class KeymasterUtils {
+public final class KeymasterUtils {
 
     private KeymasterUtils() {}