summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Expand)AuthorAgeFilesLines
* am 038cabe0: NFC integrationNick Pelly2010-09-282-0/+2127
|\
| * NFC integrationNick Pelly2010-09-282-0/+2127
* | am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActi...Mike Lockwood2010-09-281-1/+1
|\ \ | |/
| * Revert "Check for the DEVICE_POWER permission in userActivity."Mike Lockwood2010-09-281-1/+1
* | am 05105f7a: Update OBB API to include callbacksKenny Root2010-09-281-22/+39
|\ \ | |/
| * Update OBB API to include callbacksKenny Root2010-09-281-22/+39
* | am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." i...Joe Onorato2010-09-281-1/+1
|\ \ | |/
| * Check for the DEVICE_POWER permission in userActivity.Joe Onorato2010-09-281-1/+1
* | am 08cf57d7: Merge "Fixes to granting URI permissions - take into account pat...Dianne Hackborn2010-09-281-15/+61
|\ \ | |/
| * Merge "Fixes to granting URI permissions - take into account path perms." int...Dianne Hackborn2010-09-281-15/+61
| |\
| | * Fixes to granting URI permissions - take into account path perms.Dianne Hackborn2010-09-281-15/+61
* | | am c89dd54c: Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
|\ \ \ | |/ /
| * | Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
* | | am 4fc3d2f0: DO NOT MERGErepo sync . build/envsetup.sh lunch passion-en2010-09-271-1/+4
|\ \ \ | |/ /
| * | DO NOT MERGErepo sync . build/envsetup.sh lunch passion-eng2010-09-271-1/+4
| |/
* | am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." in...Hung-ying Tyan2010-09-275-3316/+0
|\ \ | |/
| * Merge "Move SipService out of SystemServer to phone process." into gingerbreadHung-ying Tyan2010-09-275-3316/+0
| |\
| | * Move SipService out of SystemServer to phone process.Hung-ying Tyan2010-09-285-3316/+0
* | | am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" i...Nick Kralevich2010-09-271-0/+1
|\ \ \ | |/ /
| * | Merge "squeeze a few more bits of randomness into /dev/random" into gingerbreadNick Kralevich2010-09-271-0/+1
| |\ \ | | |/ | |/|
| | * squeeze a few more bits of randomness into /dev/randomNick Kralevich2010-09-271-0/+1
* | | am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...Dianne Hackborn2010-09-272-2/+34
|\ \ \ | |/ /
| * | Merge "Allow all apps to call ContentResolver.getType()." into gingerbreadDianne Hackborn2010-09-272-2/+34
| |\ \
| | * | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-262-2/+34
* | | | am fccd5bc7: Fix build.Hung-ying Tyan2010-09-271-0/+3
|\ \ \ \ | |/ / /
| * | | Fix build.Hung-ying Tyan2010-09-281-0/+3
* | | | am 025a39af: SIP: misc fixesHung-ying Tyan2010-09-271-25/+43
|\ \ \ \ | |/ / /
| * | | SIP: misc fixesHung-ying Tyan2010-09-281-25/+43
* | | | am 00a22064: SipService: handle cross-domain authentication errorHung-ying Tyan2010-09-271-1/+19
|\ \ \ \ | |/ / /
| * | | SipService: handle cross-domain authentication errorHung-ying Tyan2010-09-271-1/+19
* | | | am 465618ed: Merge "Use buffered output during packages.xml write" into ginge...Kenny Root2010-09-271-2/+4
|\ \ \ \ | |/ / /
| * | | Use buffered output during packages.xml writeKenny Root2010-09-261-2/+4
| |/ /
* | | am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.Jeff Brown2010-09-241-75/+129
|\ \ \ | |/ /
| * | Fixed some timeout and lock reentrance issues with broadcasts.Jeff Brown2010-09-241-75/+129
* | | am a7ef18fc: Merge "Some debugging support." into gingerbreadDianne Hackborn2010-09-241-1/+4
|\ \ \ | |/ /
| * | Merge "Some debugging support." into gingerbreadDianne Hackborn2010-09-241-1/+4
| |\ \ | | |/ | |/|
| | * Some debugging support.Dianne Hackborn2010-09-241-1/+4
* | | am 194bbcce: SIP: longer timeout for making call, shorter for cancellingHung-ying Tyan2010-09-241-1/+1
|\ \ \ | |/ /
| * | SIP: longer timeout for making call, shorter for cancellingHung-ying Tyan2010-09-251-1/+1
| |/
* | am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gin...Robert Greenwalt2010-09-241-92/+198
|\ \ | |/
| * Merge "Move long Connectivity tasks to handler thread." into gingerbreadRobert Greenwalt2010-09-241-92/+198
| |\
| | * Move long Connectivity tasks to handler thread.Robert Greenwalt2010-09-231-92/+198
* | | am 658bec95: SDP: remove dead code.Chia-chi Yeh2010-09-231-1/+0
|\ \ \ | |/ /
| * | SDP: remove dead code.Chia-chi Yeh2010-09-241-1/+0
* | | am 84a357bb: Refactoring SIP classes to get ready for API review.Hung-ying Tyan2010-09-233-62/+63
|\ \ \ | |/ /
| * | Refactoring SIP classes to get ready for API review.Hung-ying Tyan2010-09-243-62/+63
* | | am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of...Joe Onorato2010-09-231-1/+3
|\ \ \ | |/ /
| * | Merge "Crash apps when they provide bad notifications instead of crashing the...Joe Onorato2010-09-231-1/+3
| |\ \
| | * | Crash apps when they provide bad notifications instead of crashing the system...Joe Onorato2010-09-231-1/+3
* | | | am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbreadChung-yih Wang2010-09-231-0/+6
|\ \ \ \ | |/ / /