Merge "Get HAL services with retry" into rvc-dev

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) {

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;

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;