summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix issue 3388775."Eric Laurent2011-03-021-6/+6
|\
| * Fix issue 3388775.Eric Laurent2011-03-011-6/+6
* | am 0e99d3bf: am df33b8c5: Merge "Check for NTP time as soon as WIFI is connec...Amith Yamasani2011-03-021-0/+32
|\ \
| * \ am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into ho...Amith Yamasani2011-03-011-0/+32
| |\ \
| | * \ Merge "Check for NTP time as soon as WIFI is connected." into honeycombAmith Yamasani2011-03-011-0/+32
| | |\ \
| | | * | Check for NTP time as soon as WIFI is connected.Amith Yamasani2011-03-011-0/+32
| * | | | am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE....Wink Saville2011-02-281-7/+5
| |\ \ \ \ | | |/ / /
| | * | | Fixing the write of BackgroundData setting, DO NOT MERGE.Wink Saville2011-02-281-7/+5
| * | | | am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| |\ \ \ \
| | * \ \ \ am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| | |\ \ \ \
| | | * \ \ \ am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| | | |\ \ \ \
| | | | * | | | GpsLocationProvider: Clean up HAL initialization/cleanup sequenceMike Lockwood2011-02-231-141/+83
* | | | | | | | Merge "Start using NetworkUtils.numericToInetAddress."Robert Greenwalt2011-03-023-13/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-023-13/+14
* | | | | | | | | Merge "Fix issue #3431230: "am" debugging commands failing on -userdebug builds"Dianne Hackborn2011-03-021-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #3431230: "am" debugging commands failing on -userdebug buildsDianne Hackborn2011-03-011-4/+5
* | | | | | | | | | Merge "Switch to returnCode for IPackageDeleteObserver"Kenny Root2011-03-021-8/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Switch to returnCode for IPackageDeleteObserverKenny Root2011-03-011-8/+9
* | | | | | | | | | Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not ...Dianne Hackborn2011-03-011-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted.Dianne Hackborn2011-03-011-4/+6
* | | | | | | | | | | Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"Mike Lockwood2011-03-011-8/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | UsbDeviceSettingsManager: don't write settings file when not necessaryMike Lockwood2011-03-011-8/+18
* | | | | | | | | | | | Merge "Fix UsbDeviceSettingsManager locking."Mike Lockwood2011-03-012-156/+181
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix UsbDeviceSettingsManager locking.Mike Lockwood2011-03-012-156/+181
* | | | | | | | | | | | Merge "Move USB framework support from android.hardware to android.hardware.u...Mike Lockwood2011-03-015-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-015-17/+17
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix issue 3479042."Eric Laurent2011-03-015-1/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue 3479042.Eric Laurent2011-02-285-1/+28
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Using AsyncChannel for wifi connectivity"Irfan Sheriff2011-03-011-37/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Using AsyncChannel for wifi connectivityIrfan Sheriff2011-02-281-37/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge "Add platform features for USB host and USB accessory support."Mike Lockwood2011-02-281-3/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add platform features for USB host and USB accessory support.Mike Lockwood2011-02-281-3/+7
* | | | | | | | | | | Merge "UsbManager: Enhancements for managing USB devices and accessories"Mike Lockwood2011-02-285-40/+1091
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | UsbManager: Enhancements for managing USB devices and accessoriesMike Lockwood2011-02-285-40/+1091
* | | | | | | | | | Small change to AppWidgetProviderInfo public field name and docsAdam Cohen2011-02-281-1/+1
* | | | | | | | | | Merge "You can now specify a custom display size as NxM."Dianne Hackborn2011-02-281-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | You can now specify a custom display size as NxM.Dianne Hackborn2011-02-281-2/+1
| |/ / / / / / / / /
* | | | | | | | | | Fix bug 3376700 Volume too loud at lowest settingJean-Michel Trivi2011-02-271-1/+9
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from usi...Jamie Gennis2011-02-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer toke...Jamie Gennis2011-02-271-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into g...Jamie Gennis2011-02-271-1/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbreadJamie Gennis2011-02-271-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Prevent SurfaceFlinger from using layer token 31.Jamie Gennis2011-02-101-1/+1
| | * | | | | | | | am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gi...Robert Greenwalt2011-02-161-44/+17
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | DO NOT MERGE - backport of l92a02b31 from masterRobert Greenwalt2011-02-111-44/+17
| | * | | | | | | am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer ...Mathias Agopian2011-02-092-6/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | fix [3421350] Killing a game that uses the accelerometer renders the device u...Mathias Agopian2011-02-032-6/+9
| | | |/ / / / /
| * | | | | | | am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyg...Mike Lockwood2011-02-261-0/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()Mike Lockwood2011-02-261-0/+8
| | | |_|_|_|/ | | |/| | | |
| * | | | | | am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into ho...Irfan Sheriff2011-02-231-0/+12
| |\ \ \ \ \ \ | | |/ / / / /