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

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

Merge "Keystore 2.0: Make Bluetooth app ready for Keystore 2.0 part 2." am:... 

Merge "Keystore 2.0: Make Bluetooth app ready for Keystore 2.0 part 2." am: c63c326b am: 4f529003

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e621f1068bb16161f3d6c77896b1d33d622af09
parents 291fcefb 4f529003

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

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.bluetooth.btservice.bluetoothkeystore;



import android.annotation.Nullable;

import android.os.Process;

import android.os.SystemProperties;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;
@@ -821,7 +820,6 @@ public class BluetoothKeystoreService { 
                        .setBlockModes(KeyProperties.BLOCK_MODE_GCM)

                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)

                        .setKeySize(KEY_LENGTH)

                        .setUid(Process.BLUETOOTH_UID)

                        .build();



                keyGenerator.init(keyGenParameterSpec);