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

resolved conflicts for merge of 92ab0b91 to master

Browse Source 
Change-Id: I66d6849700759163669faa930f07a7e968df5155
This commit is contained in:
Jeff Brown
2014-05-29 18:25:11 -07:00
parent 30643dfcd1 92ab0b91cd
commit 094b2136f0
2 changed files with 135 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,6 @@ public final class SystemServer {
IPackageManager pm = null;
WindowManagerService wm = null;
BluetoothManagerService bluetooth = null;
DockObserver dock = null;
UsbService usb = null;
SerialService serial = null;
RecognitionManagerService recognition = null;
@ -789,13 +788,7 @@ public final class SystemServer {
}
if (!disableNonCoreServices) {
try {
Slog.i(TAG, "Dock Observer");
// Listen for dock station changes
dock = new DockObserver(context);
} catch (Throwable e) {
reportWtf("starting DockObserver", e);
}
mSystemServiceManager.startService(DockObserver.class);
}
if (!disableMedia) {
@ -1085,7 +1078,6 @@ public final class SystemServer {
final NetworkPolicyManagerService networkPolicyF = networkPolicy;
final ConnectivityService connectivityF = connectivity;
final NetworkScoreService networkScoreF = networkScore;
final DockObserver dockF = dock;
final WallpaperManagerService wallpaperF = wallpaper;
final InputMethodManagerService immF = imm;
final RecognitionManagerService recognitionF = recognition;
@ -1158,11 +1150,6 @@ public final class SystemServer {
} catch (Throwable e) {
reportWtf("making Connectivity Service ready", e);
}
try {
if (dockF != null) dockF.systemReady();
} catch (Throwable e) {
reportWtf("making Dock Service ready", e);
}
try {
if (recognitionF != null) recognitionF.systemReady();
} catch (Throwable e) {