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

Commit 57e77f7c authored by Bo Zhu's avatar Bo Zhu
Browse files

Fix some nits while reading the code 

Test: None
Change-Id: Id231a497ad1c27de257f9e9f02f8373c5c67a68d
parent 37d870bc

core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class RecoverableKeyStoreLoader { 
     * Imports keys.

     *

     * @param sessionId Id for recovery session, same as in

     *     {@link #startRecoverySession(String, byte[], byte[], byte[], List)} on}.

     *     {@link #startRecoverySession(String, byte[], byte[], byte[], List)}.

     * @param recoveryKeyBlob Recovery blob encrypted by symmetric key generated for this session.

     * @param applicationKeys Application keys. Key material can be decrypted using recoveryKeyBlob

     *     and session. KeyStore only uses package names from the application info in {@link

services/core/java/com/android/server/locksettings/LockSettingsService.java

+3 −2
Original line number Diff line number Diff line
@@ -2026,8 +2026,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }



    @Override

    public Map<String, byte[]> recoverKeys(@NonNull String sessionId, @NonNull byte[] recoveryKeyBlob,

            @NonNull List<KeyEntryRecoveryData> applicationKeys, @UserIdInt int userId)

    public Map<String, byte[]> recoverKeys(@NonNull String sessionId,

            @NonNull byte[] recoveryKeyBlob, @NonNull List<KeyEntryRecoveryData> applicationKeys,

            @UserIdInt int userId)

            throws RemoteException {

        return mRecoverableKeyStoreManager.recoverKeys(

                sessionId, recoveryKeyBlob, applicationKeys, userId);

services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ public class PlatformKeyManager { 
     *

     * @hide

     */

    public static PlatformKeyManager getInstance(Context context, RecoverableKeyStoreDb database, int userId)

    public static PlatformKeyManager getInstance(Context context, RecoverableKeyStoreDb database,

            int userId)

            throws KeyStoreException, NoSuchAlgorithmException, InsecureUserException {

        context = context.getApplicationContext();

        PlatformKeyManager keyManager = new PlatformKeyManager(

services/core/java/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDb.java

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ public class RecoverableKeyStoreDb { 
     *

     * @hide

     */

    @Nullable

    public Long getServerParameters(int userId, int uid) {

        SQLiteDatabase db = mKeyStoreDbHelper.getReadableDatabase();