am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev

* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8': Add ThermalObserver system service to capture thermal state uevents.
2015-09-26 06:55:22 +00:00
parent 7e9f6fbf0f 6ad696c35b
commit 979a22eaf9
4 changed files with 185 additions and 0 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -875,6 +875,11 @@ public final class SystemServer {

            if (!disableNonCoreServices) {
                mSystemServiceManager.startService(DockObserver.class);
+
+                if (context.getPackageManager().hasSystemFeature
+                        (PackageManager.FEATURE_WATCH)) {
+                    mSystemServiceManager.startService(ThermalObserver.class);
+                }
            }

            traceBeginAndSlog("StartWiredAccessoryManager");