diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 3574a6411b073..9297a43b04aa3 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -824,7 +824,7 @@ public class LockSettingsService extends ILockSettings.Stub { private void getAuthSecretHal() { try { - mAuthSecretService = IAuthSecret.getService(); + mAuthSecretService = IAuthSecret.getService(/* retry */ true); } catch (NoSuchElementException e) { Slog.i(TAG, "Device doesn't implement AuthSecret HAL"); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java index fc46345175633..d644b1dc6ca08 100644 --- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java +++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java @@ -391,7 +391,7 @@ public class SyntheticPasswordManager { @VisibleForTesting protected IWeaver getWeaverService() throws RemoteException { try { - return IWeaver.getService(); + return IWeaver.getService(/* retry */ true); } catch (NoSuchElementException e) { Slog.i(TAG, "Device does not support weaver"); return null; diff --git a/services/core/java/com/android/server/oemlock/VendorLock.java b/services/core/java/com/android/server/oemlock/VendorLock.java index 37540d039b9e7..9c876da320a93 100644 --- a/services/core/java/com/android/server/oemlock/VendorLock.java +++ b/services/core/java/com/android/server/oemlock/VendorLock.java @@ -38,7 +38,7 @@ class VendorLock extends OemLock { static IOemLock getOemLockHalService() { try { - return IOemLock.getService(); + return IOemLock.getService(/* retry */ true); } catch (NoSuchElementException e) { Slog.i(TAG, "OemLock HAL not present on device"); return null;