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

Commit 3d1aadee authored by Weichin Weng's avatar Weichin Weng Committed by Automerger Merge Worker
Browse files

Merge "Common Criteria mode: make sure all keys are decrypted when init JNI."... 

Merge "Common Criteria mode: make sure all keys are decrypted when init JNI." am: cd8f8ca4 am: 2d2d571c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife0de1d7128f4b881221f2e9c1c641290332b8ed
parents 39ff153e 2d2d571c

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

+3 −0
Original line number Diff line number Diff line
@@ -298,6 +298,9 @@ public class BluetoothKeystoreService { 
     */

    public void initJni() {

        debugLog("initJni()");

        // Need to make sure all keys are decrypted.

        stopThread();

        startThread();

        // Initialize native interface

        mBluetoothKeystoreNativeInterface.init();

    }