Matthew Xie
9631314e3d
Fix merge error, put in tmp workaround for input manager.
...
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
2012-07-16 21:29:12 -07:00
fredc
0f42037eb7
Non persistent adapter service
...
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5
Conflicts:
core/java/android/bluetooth/BluetoothInputDevice.java
Conflicts:
core/java/com/android/internal/app/ShutdownThread.java
services/java/com/android/server/SystemServer.java
Conflicts:
services/java/com/android/server/SystemServer.java
services/java/com/android/server/pm/ShutdownThread.java
2012-07-16 21:20:54 -07:00
Jaikumar Ganesh
e21a4ac09d
Add a new version of the disable API.
...
This allows for the setting to be persisted or not.
Also turn on Bluetooth in System Server if needed.
It won't work currently because the service wouldn't have
started.
Change-Id: I15fa2bff93aa32134c1b565fcbe90ba68614b6a1
2012-07-16 21:14:15 -07:00
Jaikumar Ganesh
1abb1cb3a8
Changes to Bluetooth Service structure.
...
Changes to make Bluetooth Service part of the system_service.
These changes may be temporary.
Changes to update to the new disable API.
Change-Id: If89dba17e6e6c6daa53c37684221763a2da076e9
Conflicts:
services/java/com/android/server/pm/PackageManagerService.java
2012-07-13 22:22:51 -07:00
Craig Mautner
2c59c5b6b2
am 2dca20e1: am 4fa46485: Merge "Update dumpsys power output." into jb-dev
...
* commit '2dca20e194778e6ce54709a484442df77f8d11be':
Update dumpsys power output.
2012-06-28 10:03:06 -07:00
Dianne Hackborn
5359bc38a2
am 2e8295ce: am 3bb98aec: Merge "Fix issue #6730064 : When turning off Nakasi, it very often..." into jb-dev
...
* commit '2e8295ce1861d8284f16e0f0f80475db0ec2983f':
Fix issue #6730064 : When turning off Nakasi, it very often...
2012-06-26 16:40:48 -07:00
Jeff Brown
8411df2ffd
Merge "Remove dead code in PowerManagerService."
2012-06-22 15:37:56 -07:00
Jeff Brown
88c997a5ab
Remove dead code in PowerManagerService.
...
Also update some code to match coding conventions.
Change-Id: I70be0e6575a20ad268fecdbc6d59ab83915c0f23
2012-06-22 13:57:45 -07:00
Jeff Brown
223d224fcb
am 071ed334: am fc32ec9a: Merge "Don\'t reset brightness to 0 on initial boot." into jb-dev
...
* commit '071ed3348739cb3f2bb9ef169067440c8c61b881':
Don't reset brightness to 0 on initial boot.
2012-06-20 22:34:42 -07:00
Jeff Brown
4f8ecd8029
Move power manager to a new package.
...
Change-Id: I5f5a6435e64354b7d6535e8e9a63934ba7a3f448
2012-06-18 19:43:44 -07:00
