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

Commit 0d1f0723 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am:... 

Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb am: fb548f44 am: 82c0b65c

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



Change-Id: If0c8ce77cee2017e0fa24b29223caf732037967a
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a757ddc8 82c0b65c

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

+5 −0
Original line number Diff line number Diff line
@@ -143,10 +143,12 @@ public class Watchdog { 
            "android.hardware.media.omx@1.0::IOmx",

            "android.hardware.media.omx@1.0::IOmxStore",

            "android.hardware.neuralnetworks@1.0::IDevice",

            "android.hardware.power@1.0::IPower",

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

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

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

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

            "android.hardware.vibrator@1.0::IVibrator",

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

            "android.system.suspend@1.0::ISystemSuspend"

    );
@@ -155,7 +157,10 @@ public class Watchdog { 
            "android.hardware.biometrics.face.IFace/",

            "android.hardware.biometrics.fingerprint.IFingerprint/",

            "android.hardware.light.ILights/",

            "android.hardware.power.IPower/",

            "android.hardware.power.stats.IPowerStats/",

            "android.hardware.vibrator.IVibrator/",

            "android.hardware.vibrator.IVibratorManager/"

    };



    private static Watchdog sWatchdog;