summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permissio...Mike Lockwood2010-09-281-1/+1
|\
| * 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
* | | Wifi: Update code for new BT Apis.Jaikumar Ganesh2010-09-281-15/+11
* | | Update code for new BT APIs.Jaikumar Ganesh2010-09-281-4/+35
* | | resolved conflicts for merge of d8e8186c to masterKenny Root2010-09-281-22/+39
|\ \ \ | |/ /
| * | 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 f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in use...Joe Onorato2010-09-281-1/+1
|\ \ \ | |/ /
| * | am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." i...Joe Onorato2010-09-281-1/+1
| |\ \ | | |/
| | * Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbreadJoe Onorato2010-09-281-1/+1
| | |\
| | | * Check for the DEVICE_POWER permission in userActivity.Joe Onorato2010-09-281-1/+1
* | | | am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gi...Eric Laurent2010-09-281-8/+32
|\ \ \ \ | |/ / /
| * | | am aeb2c62e: Merge "Fix several audio effects problems." into gingerbreadEric Laurent2010-09-281-8/+32
| |\ \ \ | | |/ /
| | * | Fix several audio effects problems.Eric Laurent2010-09-281-8/+32
| | |/
* | | am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take int...Dianne Hackborn2010-09-281-15/+61
|\ \ \ | |/ /
| * | 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 6db64689: am c89dd54c: Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | Fix build.Hung-ying Tyan2010-09-281-10/+0
* | | resolved conflicts for merge of 2a36a778 to masterHung-ying Tyan2010-09-285-3306/+0
|\ \ \ | |/ /
| * | 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 d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /...Nick Kralevich2010-09-271-0/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | | resolved conflicts for merge of 191a25e1 to masterWu-cheng Li2010-09-272-6/+16
|\ \ \ \ \ | |/ / / /
| * | | | am 83ea6389: Merge "The old overlay should be destroyed if orientation change...Wu-cheng Li2010-09-272-6/+16
| |\ \ \ \ | | |/ / /
| | * | | Merge "The old overlay should be destroyed if orientation changes." into ging...Wu-cheng Li2010-09-272-6/+16
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | The old overlay should be destroyed if orientation changes.Wu-cheng Li2010-09-272-6/+16
| * | | | 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
* | | | | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-272-2/+34
* | | | | | Add support for transferring touch focus.Jeff Brown2010-09-272-0/+46
* | | | | | am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events acros...Jeff Brown2010-09-271-5/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 14a288da: Merge "Add suuport for splitting touch events across windows." i...Jeff Brown2010-09-271-5/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add suuport for splitting touch events across windows." into gingerbreadJeff Brown2010-09-271-5/+3
| | |\ \ \ \
| | | * | | | Add suuport for splitting touch events across windows.Jeff Brown2010-09-261-5/+3
* | | | | | | am 45a83a89: am fccd5bc7: Fix build.Hung-ying Tyan2010-09-271-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fccd5bc7: Fix build.Hung-ying Tyan2010-09-271-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix build.Hung-ying Tyan2010-09-281-0/+3
* | | | | | | am c5027642: am 025a39af: SIP: misc fixesHung-ying Tyan2010-09-271-25/+43
|\ \ \ \ \ \ \ | |/ / / / / /