diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 04:37:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-02 04:37:46 +0000 |
| commit | 11969e826621a4bf6bcd3bbc1364307f5df0f5e9 (patch) | |
| tree | 8b46532d659361d274cf7d3b75619b474c3319c1 /core | |
| parent | 9b4d25a8c56d2ac512a3afb112b6e3687ca2773c (diff) | |
| parent | af9d45e88b173a30cd20db854731e0e5eb207afa (diff) | |
| download | frameworks_base-11969e826621a4bf6bcd3bbc1364307f5df0f5e9.zip frameworks_base-11969e826621a4bf6bcd3bbc1364307f5df0f5e9.tar.gz frameworks_base-11969e826621a4bf6bcd3bbc1364307f5df0f5e9.tar.bz2 | |
Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 7 |
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) { |