Merge "NIAP: Make sure that call getOrCreateSecretKey once at a time" am: a5c7c45b64 am: 067d096876 (bdf4dbd2) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -797,7 +797,8 @@ public class BluetoothKeystoreService {
		return keyStore;
		}

		private SecretKey getOrCreateSecretKey() {
		// The getOrGenerate semantic on keystore is not thread safe, need to synchronized it.
		private synchronized SecretKey getOrCreateSecretKey() {
		SecretKey secretKey = null;
		try {
		KeyStore keyStore = getKeyStore();