summaryrefslogtreecommitdiffstats
path: root/services/java/com
Commit message (Expand)AuthorAgeFilesLines
* am 2daa0c93: Merge "Add address flags and scope to LinkAddress."Lorenzo Colitti2013-12-091-12/+11
|\
| * Merge "Add address flags and scope to LinkAddress."Lorenzo Colitti2013-12-071-12/+11
| |\
| | * Add address flags and scope to LinkAddress.Lorenzo Colitti2013-12-061-12/+11
* | | am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."Nick Kralevich2013-12-061-74/+174
|\ \ \ | |/ /
| * | 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 b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."Nick Kralevich2013-12-021-14/+0
|\ \ \ | |/ /
| * | Remove setEnforcingMode from SELinuxPolicyInstallReceiver.Stephen Smalley2013-12-021-14/+0
* | | am f226bc60: Merge "Use LinkAddress in address notifications."Lorenzo Colitti2013-11-261-6/+10
|\ \ \ | |/ /
| * | Use LinkAddress in address notifications.Lorenzo Colitti2013-11-261-6/+10
* | | am 9d4ac970: Merge "Pass DNS server info notifications to observers."Lorenzo Colitti2013-11-261-0/+36
|\ \ \ | |/ /
| * | Pass DNS server info notifications to observers.Lorenzo Colitti2013-11-251-0/+36
* | | am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."Lorenzo Colitti2013-11-261-14/+9
|\ \ \ | |/ /
| * | Minor cleanups to NetdCallbackReceiver.onEvent.Lorenzo Colitti2013-11-251-14/+9
* | | am 8a234809: Merge "Use BaseNetworkObserver in Tethering."Lorenzo Colitti2013-11-261-9/+2
|\ \ \ | |/ /
| * | Use BaseNetworkObserver in Tethering.Lorenzo Colitti2013-11-251-9/+2
| * | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-22186-13095/+31361
| |\ \
* | \ \ am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-213-72/+223
|\ \ \ \
| * | | | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-213-72/+223
* | | | | am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured by screensh...Craig Mautner2013-11-211-7/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplication...Craig Mautner2013-11-211-7/+1
| |\ \ \ \
| | * | | | Make SurfaceView layers captured by screenshotApplications()Sangkyu Lee2013-11-211-7/+1
| * | | | | am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"Robert Greenwalt2013-11-132-0/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix for the invalid Global Proxy Setting"Robert Greenwalt2013-11-142-0/+21
| | |\ \ \ \
| | | * | | | Fix for the invalid Global Proxy SettingRaj Mamadgi2013-11-122-0/+21
* | | | | | | am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and...Dianne Hackborn2013-11-211-3/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix issue #11790471: Crash removed home buttons and notification bar/shadeDianne Hackborn2013-11-211-3/+5
* | | | | | | am e3705342: am b0183f0a: Harden against transiently unavailable backup trans...Christopher Tate2013-11-191-65/+187
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-191-65/+187
* | | | | | | am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-devCraig Mautner2013-11-194-12/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Notify apps when insets change." into klp-devCraig Mautner2013-11-194-12/+16
| |\ \ \ \ \ \
| | * | | | | | Notify apps when insets change.Craig Mautner2013-11-184-12/+16
* | | | | | | | am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-181-155/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Trying to unbreak build...Sascha Prueter2013-11-191-155/+62
* | | | | | | | am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backu...Christopher Tate2013-11-181-62/+155
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-181-62/+155
* | | | | | | 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