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

Commit f0b51e9d authored by Tucker Sylvestro's avatar Tucker Sylvestro Committed by Android (Google) Code Review
Browse files

Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev

parents 6cffa2bf b32aae2a

core/java/android/security/IKeystoreService.aidl

+1 −0
Original line number Diff line number Diff line
@@ -76,4 +76,5 @@ interface IKeystoreService { 
    int onUserAdded(int userId, int parentId);

    int onUserRemoved(int userId);

    int attestKey(String alias, in KeymasterArguments params, out KeymasterCertificateChain chain);

    int onDeviceOffBody();

}

keystore/java/android/security/KeyStore.java

+10 −0
Original line number Diff line number Diff line
@@ -626,6 +626,16 @@ public class KeyStore { 
        }

    }



    /**

     * Notify keystore that the device went off-body.

     */

    public void onDeviceOffBody() {

        try {

            mBinder.onDeviceOffBody();

        } catch (RemoteException e) {

            Log.w(TAG, "Cannot connect to keystore", e);

        }

    }



    /**

     * Returns a {@link KeyStoreException} corresponding to the provided keystore/keymaster error