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

Commit ac8ba31b authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Get HAL services with retry" into rvc-dev am: 884aa6af am: 39d11fd8 

Change-Id: I65fcf8a773780306cc367e7ec1f286e34af95af0
parents 29cac597 39d11fd8

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

services/core/java/com/android/server/oemlock/VendorLock.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;