drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge 4ce22057, regen api/current.txt

Browse Source 
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
This commit is contained in:
Ed Heyl
2014-06-09 10:41:21 -07:00
parent 03f5ff482e 3f48068d78
commit 5adb67d4ce
16 changed files with 5 additions and 1843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@ -130,8 +130,6 @@ public final class SystemServer {
"com.android.server.wifi.passpoint.WifiPasspointService";
private static final String WIFI_P2P_SERVICE_CLASS =
"com.android.server.wifi.p2p.WifiP2pService";
private static final String HDMI_CEC_SERVICE_CLASS =
"com.android.server.hdmi.HdmiCecService";
private static final String ETHERNET_SERVICE_CLASS =
"com.android.server.ethernet.EthernetService";
private static final String TASK_SERVICE_CLASS =
@ -953,12 +951,6 @@ public final class SystemServer {
reportWtf("starting MediaSessionService", e);
}
try {
mSystemServiceManager.startService(HDMI_CEC_SERVICE_CLASS);
} catch (Throwable e) {
reportWtf("starting HdmiCec Service", e);
}
try {
mSystemServiceManager.startService(HdmiControlService.class);
} catch (Throwable e) {