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

Commit 623da4ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Use public API to get Keystore for bluetooth." am: 8019af2f 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1615283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d74b82fce3fc92ecace09d5a57550e18f7df95c
parents d5a3bb29 8019af2f

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

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.bluetooth.btservice.bluetoothkeystore; 
import android.annotation.Nullable;

import android.os.Process;

import android.os.SystemProperties;

import android.security.keystore.AndroidKeyStoreProvider;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;

import android.util.Log;
@@ -43,6 +42,7 @@ import java.security.NoSuchAlgorithmException; 
import java.security.NoSuchProviderException;

import java.security.ProviderException;

import java.security.UnrecoverableEntryException;

import java.security.cert.CertificateException;

import java.util.Base64;

import java.util.HashMap;

import java.util.LinkedList;
@@ -786,11 +786,11 @@ public class BluetoothKeystoreService { 


        while ((counter <= TRY_MAX) && (keyStore == null)) {

            try {

                keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.BLUETOOTH_UID);

            } catch (NoSuchProviderException e) {

                reportKeystoreException(e, "cannot find crypto provider");

            } catch (KeyStoreException e) {

                reportKeystoreException(e, "cannot find the keystore");

                keyStore = KeyStore.getInstance("AndroidKeyStore");

                keyStore.load(null);

            } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException

                    | IOException e) {

                reportKeystoreException(e, "cannot open keystore");

            }

            counter++;

        }