summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server
Commit message (Expand)AuthorAgeFilesLines
* am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSy...Matthew Williams2013-11-142-9/+29
|\
| * Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-devMatthew Williams2013-11-142-9/+29
| |\
| | * SyncManager now returns copy on getCurrentSyncs()Matthew Williams2013-11-132-9/+29
* | | am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" in...Robert Greenwalt2013-11-132-0/+21
|\ \ \ | |/ /
| * | Merge "Fix for the invalid Global Proxy Setting" into klp-devRobert Greenwalt2013-11-142-0/+21
| |\ \
| | * | Fix for the invalid Global Proxy SettingRaj Mamadgi2013-11-142-0/+21
* | | | am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-devCraig Mautner2013-11-131-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "Add null pointer check." into klp-devCraig Mautner2013-11-141-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Add null pointer check.Craig Mautner2013-11-131-1/+3
* | | | am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been d...Craig Mautner2013-11-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Keyguard isn't visible if it hasn't been drawn." into klp-devCraig Mautner2013-11-131-1/+1
| |\ \ \
| | * | | Keyguard isn't visible if it hasn't been drawn.Craig Mautner2013-11-131-1/+1
| | |/ /
* | | | am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or on...Christopher Tate2013-11-131-26/+20
|\ \ \ \ | |/ / /
| * | | Merge "Support preferred activities with zero or one scheme in the filter" in...Christopher Tate2013-11-131-26/+20
| |\ \ \
| | * | | Support preferred activities with zero or one scheme in the filterChristopher Tate2013-11-121-26/+20
* | | | | am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResol...John Huang2013-11-131-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo"...John Huang2013-11-131-2/+6
| |\ \ \ \
| | * | | | Get rid of a race in NsdService in stopResolveService and getAddrInfoVinit Deshapnde2013-11-121-2/+6
* | | | | | am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"Robert Greenwalt2013-11-131-2/+5
|\ \ \ \ \ \
| * \ \ \ \ \ am 18490abd: Merge "Fix NPE in ConnectivityService"Robert Greenwalt2013-11-131-2/+5
| |\ \ \ \ \ \
| | * | | | | | Fix NPE in ConnectivityServiceKen Mixter2013-11-121-2/+5
* | | | | | | | am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into kl...Jeff Brown2013-11-133-23/+83
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Finalize assets for screen casting." into klp-devJeff Brown2013-11-133-23/+83
| |\ \ \ \ \ \ \
| | * | | | | | | Finalize assets for screen casting.Jeff Brown2013-11-133-23/+83
* | | | | | | | | am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large a...John Spurlock2013-11-131-4/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Ensure wallpaper hint is at least as large as the display." into klp-devJohn Spurlock2013-11-131-4/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Ensure wallpaper hint is at least as large as the display.John Spurlock2013-11-121-4/+15
* | | | | | | | | am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own confi...Craig Mautner2013-11-123-6/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Relayout windows that handle their own config change." into klp-devCraig Mautner2013-11-123-6/+13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Relayout windows that handle their own config change.Craig Mautner2013-11-123-6/+13
| | |/ / / / / /
* | | | | | | | am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin ...Amith Yamasani2013-11-121-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix inconsistency in reporting device admin active state." into klp-devAmith Yamasani2013-11-121-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix inconsistency in reporting device admin active state.Amith Yamasani2013-11-111-0/+1
* | | | | | | | am 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks." int...Craig Mautner2013-11-126-19/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add event logging for tasks and stacks.Craig Mautner2013-11-126-19/+30
| | |/ / / / / | |/| | | | |
* | | | | | | am 854395ad: am c481a634: Merge "UI tweaks." into klp-devJeff Brown2013-11-111-13/+52
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | UI tweaks.Jeff Brown2013-11-111-13/+52
| | |_|_|_|/ | |/| | | |
* | | | | | am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting ...Dianne Hackborn2013-11-112-24/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Work on issue #11634365: Leaking restarting services" into klp-devDianne Hackborn2013-11-122-24/+45
| |\ \ \ \ \
| | * | | | | Work on issue #11634365: Leaking restarting servicesDianne Hackborn2013-11-112-24/+45
* | | | | | | am 64234cfc: am 09e7e0ef: Delegate existence of account check to Authenticator.Jatin Lodhia2013-11-111-11/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Delegate existence of account check to Authenticator.Jatin Lodhia2013-11-111-11/+49
| |/ / / / /
* | | | | | am 7e40e317: am c85a1143: Merge "Fix issue #11630188: Still seeing some proce...Dianne Hackborn2013-11-111-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix issue #11630188: Still seeing some processes not on LRU list error...Dianne Hackborn2013-11-111-0/+2
| |\ \ \ \ \
| | * | | | | Fix issue #11630188: Still seeing some processes not on LRU list errorsDianne Hackborn2013-11-111-0/+2
* | | | | | | am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings ...Jeff Brown2013-11-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Changes to support new screen cast settings screen." into klp-devJeff Brown2013-11-111-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Changes to support new screen cast settings screen.Jeff Brown2013-11-101-1/+1
* | | | | | | am 86b06976: am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." i...Craig Mautner2013-11-111-4/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix a couple of issues with mOpeningApps." into klp-devCraig Mautner2013-11-111-4/+1
| |\ \ \ \ \ \