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

Fix merge error, put in tmp workaround for input manager.

Browse Source 
Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread

Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
This commit is contained in:
Matthew Xie
2012-06-29 16:57:31 -07:00
committed by Android (Google) Code Review
parent 5a1195fd5f
commit 9631314e3d
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,7 +731,6 @@ class ServerThread extends Thread {
final StatusBarManagerService statusBarF = statusBar;
final DreamManagerService dreamyF = dreamy;
final InputManagerService inputManagerF = inputManager;
final BluetoothService bluetoothF = bluetooth;
// We now tell the activity manager it is okay to run third party
// code. It will call back into us once it has gotten to the state
@ -844,7 +843,8 @@ class ServerThread extends Thread {
reportWtf("making DreamManagerService ready", e);
}
try {
if (inputManagerF != null) inputManagerF.systemReady(bluetoothF);
// TODO(BT) Pass parameter to input manager
if (inputManagerF != null) inputManagerF.systemReady();
} catch (Throwable e) {
reportWtf("making InputManagerService ready", e);
}