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

Commit 039447e5 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Fix typo in LockSettingsService.getDecryptedPasswordsForAllTiedProfiles" into oc-mr1-dev 

am: 48686b6a

Change-Id: I5e32555e204f2aa574190f37748d786dda698d1f
parents 654d8a3e 48686b6a

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

+3 −2
Original line number Diff line number Diff line
@@ -1142,12 +1142,13 @@ public class LockSettingsService extends ILockSettings.Stub { 
                continue;

            }

            try {

                result.put(userId, getDecryptedPasswordForTiedProfile(userId));

                result.put(managedUserId, getDecryptedPasswordForTiedProfile(managedUserId));

            } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException

                    | NoSuchPaddingException | InvalidKeyException

                    | InvalidAlgorithmParameterException | IllegalBlockSizeException

                    | BadPaddingException | CertificateException | IOException e) {

                // ignore

                Slog.e(TAG, "getDecryptedPasswordsForAllTiedProfiles failed for user " +

                    managedUserId, e);

            }

        }

        return result;