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

Commit ea2a5758 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CTS issue in BootControl HIDL" into main am: bf041be9 am:... 

Merge "Fix CTS issue in BootControl HIDL" into main am: bf041be9 am: 4fe75f75 am: 6014b691 am: ee744e0b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725594



Change-Id: I55aedb818999577f051e1bfedefb0ffb69dae104
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dce757ef ee744e0b

services/core/java/com/android/server/recoverysystem/hal/BootControlHIDL.java

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.util.Slog;



import java.util.NoSuchElementException;



public class BootControlHIDL implements IBootControl {

    private static final String TAG = "BootControlHIDL";
@@ -32,7 +34,7 @@ public class BootControlHIDL implements IBootControl { 
    public static boolean isServicePresent() {

        try {

            android.hardware.boot.V1_0.IBootControl.getService(true);

        } catch (RemoteException e) {

        } catch (RemoteException | NoSuchElementException e) {

            return false;

        }

        return true;
@@ -41,7 +43,7 @@ public class BootControlHIDL implements IBootControl { 
    public static boolean isV1_2ServicePresent() {

        try {

            android.hardware.boot.V1_2.IBootControl.getService(true);

        } catch (RemoteException e) {

        } catch (RemoteException | NoSuchElementException e) {

            return false;

        }

        return true;