Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rubin Xu
2020-03-31 09:25:22 +00:00
committed by Android (Google) Code Review
parent ae370867b6 cf7dd0969f
commit 884aa6afe1
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -824,7 +824,7 @@ public class LockSettingsService extends ILockSettings.Stub {
private void getAuthSecretHal() { private void getAuthSecretHal() {
try { try {
mAuthSecretService = IAuthSecret.getService(); mAuthSecretService = IAuthSecret.getService(/* retry */ true);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
Slog.i(TAG, "Device doesn't implement AuthSecret HAL"); Slog.i(TAG, "Device doesn't implement AuthSecret HAL");
} catch (RemoteException e) { } catch (RemoteException e) {

2
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View File

@@ -391,7 +391,7 @@ public class SyntheticPasswordManager {
@VisibleForTesting @VisibleForTesting
protected IWeaver getWeaverService() throws RemoteException { protected IWeaver getWeaverService() throws RemoteException {
try { try {
return IWeaver.getService(); return IWeaver.getService(/* retry */ true);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
Slog.i(TAG, "Device does not support weaver"); Slog.i(TAG, "Device does not support weaver");
return null; return null;

2
services/core/java/com/android/server/oemlock/VendorLock.java
View File

@@ -38,7 +38,7 @@ class VendorLock extends OemLock {
static IOemLock getOemLockHalService() { static IOemLock getOemLockHalService() {
try { try {
return IOemLock.getService(); return IOemLock.getService(/* retry */ true);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
Slog.i(TAG, "OemLock HAL not present on device"); Slog.i(TAG, "OemLock HAL not present on device");
return null; return null;