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

Commit a52e9e11 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove unnecessary abstraction of classes." into main am:... 

Merge "Merge "Remove unnecessary abstraction of classes." into main am: 35434353 am: 428d0709" into main
parents cb49af29 6a1f6a4d

keystore/java/android/security/GateKeeper.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.service.gatekeeper.IGateKeeperService; 
 *

 * @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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import java.util.function.Consumer; 
/**

 * @hide

 */

public abstract class ArrayUtils {

public final class ArrayUtils {

    private ArrayUtils() {}



    public static String[] nullToEmpty(String[] array) {

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import java.util.Date; 
 *

 * @hide

 */

abstract class Utils {

public final class Utils {

    private Utils() {}



    static Date cloneIfNotNull(Date value) {

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

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ import java.util.function.Consumer; 
/**

 * @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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.security.spec.InvalidParameterSpecException; 
/**

 * @hide

 */

public abstract class KeymasterUtils {

public final class KeymasterUtils {



    private KeymasterUtils() {}