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

Commit ffdd8cec authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am:... 

Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f5154 am: bbc3e755 am: 79a4f2b7 am: e8884d1a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651545

Change-Id: I31166c242992ba1e1d7173ae74a3f777fcccfdc3
parents ea2c2cc1 e8884d1a

keystore/java/android/security/AndroidKeyStoreMaintenance.java

+14 −0
Original line number Diff line number Diff line
@@ -139,4 +139,18 @@ public class AndroidKeyStoreMaintenance { 
            return SYSTEM_ERROR;

        }

    }



    /**

     * Informs Keystore 2.0 that an off body event was detected.

     */

    public static void onDeviceOffBody() {

        if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return;

        try {

            getService().onDeviceOffBody();

        } catch (Exception e) {

            // TODO This fails open. This is not a regression with respect to keystore1 but it

            //      should get fixed.

            Log.e(TAG, "Error while reporting device off body event.", e);

        }

    }

}

keystore/java/android/security/KeyStore.java

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ public class KeyStore { 
     * Notify keystore that the device went off-body.

     */

    public void onDeviceOffBody() {

        AndroidKeyStoreMaintenance.onDeviceOffBody();

        try {

            mBinder.onDeviceOffBody();

        } catch (RemoteException e) {