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

Commit 23dd8842 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Fix alphabetical ordering of HAL_INTERFACES_OF_INTEREST" into qt-r1-dev am: 0b15cb30 

am: 27036ef1

Change-Id: I3e36d42217aee94d54209e839e710f13f6f0b7d7
parents 12669129 27036ef1

services/core/java/com/android/server/Watchdog.java

+2 −2
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public class Watchdog extends Thread { 
    public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(

            "android.hardware.audio@2.0::IDevicesFactory",

            "android.hardware.audio@4.0::IDevicesFactory",

            "android.hardware.biometrics.face@1.0::IBiometricsFace",

            "android.hardware.bluetooth@1.0::IBluetoothHci",

            "android.hardware.camera.provider@2.4::ICameraProvider",

            "android.hardware.graphics.allocator@2.0::IAllocator",
@@ -113,8 +114,7 @@ public class Watchdog extends Thread { 
            "android.hardware.media.omx@1.0::IOmxStore",

            "android.hardware.power.stats@1.0::IPowerStats",

            "android.hardware.sensors@1.0::ISensors",

            "android.hardware.vr@1.0::IVr",

            "android.hardware.biometrics.face@1.0::IBiometricsFace"

            "android.hardware.vr@1.0::IVr"

    );



    static Watchdog sWatchdog;