summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Expand)AuthorAgeFilesLines
* am f7422885: Merge "Augment SELinuxMMAC functionality."Nick Kralevich2013-12-061-74/+174
|\
| * Augment SELinuxMMAC functionality.Robert Craig2013-12-061-74/+174
* | Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-0551-864/+3984
|\ \ | |/ |/|
| * am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" int...Adam Lesinski2013-11-182-12/+10
| |\
| | * Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-devAdam Lesinski2013-11-182-12/+10
| | |\
| | | * Do not hold direct ref BatteryStatsImpl$Uid$ProcAdam Lesinski2013-11-182-12/+10
| * | | am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constra...John Spurlock2013-11-181-5/+3
| |\ \ \ | | |/ /
| | * | Merge "Use scaled display size in wallpaper constraint." into klp-devJohn Spurlock2013-11-181-5/+3
| | |\ \
| | | * | Use scaled display size in wallpaper constraint.John Spurlock2013-11-181-5/+3
| * | | | am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-devRobert Greenwalt2013-11-181-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix NPE in ConnectivityServiceRobert Greenwalt2013-11-181-1/+1
| | |/ /
| * | | am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wall...Craig Mautner2013-11-151-1/+0
| |\ \ \ | | |/ /
| | * | Restore jankless transition keyguard-to-wallpaperCraig Mautner2013-11-151-1/+0
| * | | am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast s...Jeff Brown2013-11-153-53/+71
| |\ \ \ | | |/ /
| | * | Merge "Disallow applications from initiating cast screen." into klp-devJeff Brown2013-11-153-53/+71
| | |\ \
| | | * | Disallow applications from initiating cast screen.Jeff Brown2013-11-153-53/+71
| * | | | am 64397749: am 22010817: Merge "Handle backup transport registration dynamic...Christopher Tate2013-11-142-43/+67
| |\ \ \ \ | | |/ / /
| | * | | Merge "Handle backup transport registration dynamically" into klp-devChristopher Tate2013-11-152-43/+67
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Handle backup transport registration dynamicallyChristopher Tate2013-11-142-43/+67
| * | | | am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before atte...Christopher Tate2013-11-142-0/+39
| |\ \ \ \ | | |/ / /
| | * | | Merge "Ensure recipient can be launched before attempting broadcast delivery"...Christopher Tate2013-11-142-0/+39
| | |\ \ \
| | | * | | Ensure recipient can be launched before attempting broadcast deliveryChristopher Tate2013-11-142-0/+39
| | | |/ /
| * | | | am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restartin...Dianne Hackborn2013-11-141-1/+20
| |\ \ \ \ | | |/ / /
| | * | | Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-devDianne Hackborn2013-11-141-1/+20
| | |\ \ \
| | | * | | Maybe fix issue #11634365: Leaking restarting servicesDianne Hackborn2013-11-141-1/+20
| * | | | | 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 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