From 1bc8a1f88616f3b4e54219075a971196f3492874 Mon Sep 17 00:00:00 2001 From: Nikita Iashchenko Date: Tue, 20 Apr 2021 20:27:02 +0000 Subject: [PATCH] Remove usage of Math.randomLongInternal As a part of internal libcore API cleanup some of the functions previously exposed are getting removed from public surface. Math#randomLongInternal is a wrapper around java.util.Random and has no specific implications so its usages are get refactored. Bug: 154796679 Test: m droid Change-Id: I29e0e9307fbaf9c1ac018b83014efb2d3dd74479 --- .../security/keystore2/KeyStoreCryptoOperationUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java b/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java index 0006b92b1b9b8..850c55166edcc 100644 --- a/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java +++ b/keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java @@ -40,6 +40,7 @@ import java.security.InvalidKeyException; import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; +import java.util.Random; /** * Assorted utility methods for implementing crypto operations on top of KeyStore. @@ -49,6 +50,7 @@ import java.util.List; abstract class KeyStoreCryptoOperationUtils { private static volatile SecureRandom sRng; + private static final Random sRandom = new Random(); private KeyStoreCryptoOperationUtils() {} @@ -211,7 +213,7 @@ abstract class KeyStoreCryptoOperationUtils { } else { // Keystore won't give us an operation challenge if the operation doesn't // need user authorization. So we make our own. - return Math.randomLongInternal(); + return sRandom.nextLong(); } } }