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

Commit 48686b6a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ec3ded86 4f988c98

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

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

                continue;

            }

            }

            try {

            try {

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

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

            } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException

            } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException

                    | NoSuchPaddingException | InvalidKeyException

                    | NoSuchPaddingException | InvalidKeyException

                    | InvalidAlgorithmParameterException | IllegalBlockSizeException

                    | InvalidAlgorithmParameterException | IllegalBlockSizeException

                    | BadPaddingException | CertificateException | IOException e) {

                    | BadPaddingException | CertificateException | IOException e) {

                // ignore

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

                    managedUserId, e);

            }

            }

        }

        }

        return result;

        return result;