summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aospJean-Baptiste Queru2010-08-181-12/+39
|\
| * DO NOT MERGE WifiLock extensions for high performance modeIrfan Sheriff2010-08-171-12/+39
* | am 209e6518: Merge "Make the LED colors when charging customizable by the ven...Jean-Baptiste Queru2010-08-171-10/+21
|\ \
| * \ Merge "Make the LED colors when charging customizable by the vendor"Jean-Baptiste Queru2010-08-171-10/+21
| |\ \
| | * | Make the LED colors when charging customizable by the vendorKenneth Andersson2010-08-031-10/+21
* | | | am c708e383: Merge "Revert "InputMethodService: Fix ignore case in showInputM...Jean-Baptiste Queru2010-08-171-1/+0
|\ \ \ \ | |/ / /
| * | | Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"satok2010-08-171-1/+0
* | | | am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gi...Mike Lockwood2010-08-171-2/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | GPS: Initialize XTRA support when GPS is enabledMike Lockwood2010-08-171-2/+6
* | | | am 567722ee: Merge "Fix problems with determining when to kill apps for wake ...Dianne Hackborn2010-08-153-27/+51
|\ \ \ \ | |/ / /
| * | | Merge "Fix problems with determining when to kill apps for wake usage." into ...Dianne Hackborn2010-08-153-27/+51
| |\ \ \
| | * | | Fix problems with determining when to kill apps for wake usage.Dianne Hackborn2010-08-153-27/+51
* | | | | am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into ging...Robert Greenwalt2010-08-131-62/+48
|\ \ \ \ \ | |/ / / /
| * | | | Merge "DO NOT MERGE Always set/remove default routes." into gingerbreadRobert Greenwalt2010-08-131-62/+48
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DO NOT MERGE Always set/remove default routes.Robert Greenwalt2010-08-131-62/+48
* | | | | am a8d9291d: Merge "Various battery info things:" into gingerbreadDianne Hackborn2010-08-136-22/+122
|\ \ \ \ \ | |/ / / /
| * | | | Various battery info things:Dianne Hackborn2010-08-136-22/+122
| |/ / /
* | | | am fb86ce93: Add watermark support.Dianne Hackborn2010-08-111-6/+110
|\ \ \ \ | |/ / /
| * | | Add watermark support.Dianne Hackborn2010-08-111-6/+110
* | | | am 95af0c14: Merge "Add support for the PointerLocation overlay." into ginger...Jeff Brown2010-08-112-3/+36
|\ \ \ \ | |/ / /
| * | | Merge "Add support for the PointerLocation overlay." into gingerbreadJeff Brown2010-08-112-3/+36
| |\ \ \
| | * | | Add support for the PointerLocation overlay.Jeff Brown2010-08-112-3/+36
* | | | | am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when bo...Dianne Hackborn2010-08-111-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "New system property "sys.boot_completed" set to 1 when boot completed....Dianne Hackborn2010-08-111-0/+1
| |\ \ \ \
| | * | | | New system property "sys.boot_completed" set to 1 when boot completed.Dianne Hackborn2010-08-111-0/+1
| | |/ / /
* | | | | am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gi...Kenny Root2010-08-111-74/+446
|\ \ \ \ \ | |/ / / /
| * | | | Move OBB file reading to DefaultContainerServiceKenny Root2010-08-111-74/+446
| |/ / /
* | | | am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFrom...Vairavan Srinivasan2010-08-111-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | InputMethodService: Fix ignore case in showInputMethodPickerFromClientVairavan Srinivasan2010-08-111-0/+1
* | | | Fix build: HistoryRecord is now ActivityRecordJean-Baptiste Queru2010-08-111-1/+1
* | | | resolved conflicts for merge of efcac2ff to gingerbread-plus-aospJean-Baptiste Queru2010-08-111-3/+3
|\ \ \ \ | |/ / /
| * | | InputMethodManagerService: Fix acore crash on boot upSrilakshmi Punuru2010-08-111-5/+5
* | | | am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"Jean-Baptiste Queru2010-08-111-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix isUsbMassStorageConnected() will always return true"Jean-Baptiste Queru2010-08-111-1/+1
| |\ \ \
| | * | | Fix isUsbMassStorageConnected() will always return trueTony Wu2010-08-101-1/+1
| | | |/ | | |/|
* | | | am 6061af11: Merge "Sort the IME list before showing to user"Kenny Root2010-08-101-9/+13
|\ \ \ \ | |/ / /
| * | | Merge "Sort the IME list before showing to user"Kenny Root2010-08-101-9/+13
| |\ \ \ | | |/ / | |/| |
| | * | Sort the IME list before showing to userMac Wang2010-07-231-9/+13
* | | | am 6c6d57c6: Merge "Fix focus notification" into gingerbreadKonstantin Lopyrev2010-08-091-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix focus notificationKonstantin Lopyrev2010-08-091-1/+1
* | | | am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused wind...Konstantin Lopyrev2010-08-062-0/+49
|\ \ \ \ | |/ / /
| * | | Adding a way for Hierarchy Viewer to get the focused window.Konstantin Lopyrev2010-08-062-0/+49
* | | | am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.Mike Lockwood2010-08-061-2/+2
|\ \ \ \ | |/ / /
| * | | GPS: Don't set XTRA download pending flag at boot time.Mike Lockwood2010-08-061-2/+2
* | | | am 1d62c773: Fix the buildChung-yih Wang2010-08-051-41/+41
|\ \ \ \ | |/ / /
| * | | Fix the buildChung-yih Wang2010-08-061-41/+41
* | | | am 7324489f: Merge "Add SIP service into system server." into gingerbreadChung-yih Wang2010-08-055-0/+2838
|\ \ \ \ | |/ / /
| * | | Add SIP service into system server.Chung-yih Wang2010-08-065-0/+2838
* | | | am 9b87770f: Merge "Fix crash when startForeground posts a broken Notificatio...Daniel Sandler2010-08-042-11/+25
|\ \ \ \ | |/ / /
| * | | Merge "Fix crash when startForeground posts a broken Notification." into ging...Daniel Sandler2010-08-042-11/+25
| |\ \ \