summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ContextImpl.java
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-05-29 17:10:39 +0900
committerJungshik Jang <jayjang@google.com>2014-06-02 11:03:45 +0900
commitaf9d45e88b173a30cd20db854731e0e5eb207afa (patch)
treefa232a798397100b76bccc20e1de13282952c493 /core/java/android/app/ContextImpl.java
parente74282b70b4a8ad1186fdc32204e1ecee16cd901 (diff)
downloadframeworks_base-af9d45e88b173a30cd20db854731e0e5eb207afa.zip
frameworks_base-af9d45e88b173a30cd20db854731e0e5eb207afa.tar.gz
frameworks_base-af9d45e88b173a30cd20db854731e0e5eb207afa.tar.bz2
DO NOT MERGE: Register HdmiControlService
Register the new service that will replace HdmiCecService. The old one will be removed once the client of the old service finishes migration to the new service. Change-Id: I3906292fcf0a7c8286bc89af21a03bd11d3a0e72
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
-rw-r--r--core/java/android/app/ContextImpl.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 8ffa6fe..e66534b 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -58,7 +58,9 @@ import android.hardware.ISerialManager;
import android.hardware.SerialManager;
import android.hardware.SystemSensorManager;
import android.hardware.hdmi.HdmiCecManager;
+import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiCecService;
+import android.hardware.hdmi.IHdmiControlService;
import android.hardware.camera2.CameraManager;
import android.hardware.display.DisplayManager;
import android.hardware.input.InputManager;
@@ -388,6 +390,11 @@ class ContextImpl extends Context {
return new HdmiCecManager(IHdmiCecService.Stub.asInterface(b));
}});
+ registerService(HDMI_CONTROL_SERVICE, new StaticServiceFetcher() {
+ public Object createStaticService() {
+ IBinder b = ServiceManager.getService(HDMI_CONTROL_SERVICE);
+ return new HdmiControlManager(IHdmiControlService.Stub.asInterface(b));
+ }});
registerService(CLIPBOARD_SERVICE, new ServiceFetcher() {
public Object createService(ContextImpl ctx) {