summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Expand)AuthorAgeFilesLines
* am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider fil...Mike Lockwood2010-10-261-6/+7
|\
| * Location Manager: Fix LocationManager.getBestProvider filtering.Mike Lockwood2010-10-261-6/+7
* | am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off...Joe Onorato2010-10-261-0/+8
|\ \ | |/
| * Don't turn the button backlights on if the screen is off. Part 2.Joe Onorato2010-10-251-0/+8
* | resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aospJean-Baptiste Queru2010-10-251-1/+1
|\ \
| * \ Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"Jean-Baptiste Queru2010-10-251-1/+1
| |\ \
| | * | frameworks/base: Handle null from topRunningNonDelayedActivityLockedVairavan Srinivasan2010-10-111-1/+1
| * | | Merge "Fix sometimes mExpandedView will appear while screen transforming."Joe Onorato2010-10-111-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix sometimes mExpandedView will appear while screen transforming.Tony Wu2010-10-071-0/+3
* | | | am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | GPS: Disable verbose loggingMike Lockwood2010-10-252-5/+7
* | | | am 60607a90: Make sure that when the screen is off, we don\'t try to turn the...Joe Onorato2010-10-241-2/+16
|\ \ \ \ | |/ / /
| * | | Make sure that when the screen is off, we don't try to turn the buttons on too.Joe Onorato2010-10-231-2/+16
* | | | am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbreadDianne Hackborn2010-10-221-1/+1
|\ \ \ \ | |/ / /
| * | | Fix issue #3122240: Expose xlarge in GB.Dianne Hackborn2010-10-221-1/+1
* | | | am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into g...Mike Lockwood2010-10-221-7/+14
|\ \ \ \ | |/ / /
| * | | GPS: Fix network type logic in requestRefLocationMike Lockwood2010-10-221-7/+14
* | | | am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbreadDianne Hackborn2010-10-211-2/+2
|\ \ \ \ | |/ / /
| * | | Adjust boundaries for screen sizes.Dianne Hackborn2010-10-211-2/+2
| * | | Fix isUsbMassStorageConnected() will always return trueTony Wu2010-10-201-1/+1
* | | | am bdf1706a: Merge "Reduce logging." into gingerbreadJoe Onorato2010-10-198-22/+38
|\ \ \ \ | |/ / /
| * | | Reduce logging.Joe Onorato2010-10-198-22/+38
* | | | am 18580319: DO NOT MERGE. Turn down backup logging for release.Chris Tate2010-10-191-1/+1
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE. Turn down backup logging for release.Chris Tate2010-10-191-1/+1
* | | | am 928b0748: Merge "Don\'t symlink native library paths for old apps" into gi...Kenny Root2010-10-191-7/+18
|\ \ \ \ | |/ / /
| * | | Merge "Don't symlink native library paths for old apps" into gingerbreadKenny Root2010-10-191-7/+18
| |\ \ \
| | * | | Don't symlink native library paths for old appsKenny Root2010-10-181-7/+18
* | | | | am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbreadMike Lockwood2010-10-181-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "GPS: Enable some more logging" into gingerbreadMike Lockwood2010-10-181-1/+3
| |\ \ \ \
| | * | | | GPS: Enable some more loggingMike Lockwood2010-10-181-1/+3
* | | | | | am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into g...Mike Lockwood2010-10-182-8/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Enable framework GPS and location manager logging" into gingerbreadMike Lockwood2010-10-182-8/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Enable framework GPS and location manager loggingMike Lockwood2010-10-182-8/+12
| | |/ / /
* | | | | am a8d477f0: Merge "Pressing the power button quickly needs to turn the scree...Joe Onorato2010-10-181-22/+21
|\ \ \ \ \ | |/ / / /
| * | | | Pressing the power button quickly needs to turn the screen on and off correctly.Joe Onorato2010-10-181-22/+21
| |/ / /
* | | | am 42499170: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-163-15/+37
|\ \ \ \ | |/ / /
| * | | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-163-15/+37
* | | | am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" ...Jeff Brown2010-10-152-2/+2
|\ \ \ \ | |/ / /
| * | | Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-152-2/+2
* | | | am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UI...Dianne Hackborn2010-10-156-7/+23
|\ \ \ \ | |/ / /
| * | | Work on issue #3101415: Crespo apps seem to have their UID changed over time.Dianne Hackborn2010-10-156-7/+23
* | | | am efb58101: Debug logs for issue #3101415: Apps seem to have their UID chang...Dianne Hackborn2010-10-152-24/+30
|\ \ \ \ | |/ / /
| * | | Debug logs for issue #3101415: Apps seem to have their UID changed over time.Dianne Hackborn2010-10-152-24/+30
* | | | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-153-2172/+5
|\ \ \ \ | |/ / /
| * | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-153-2172/+5
* | | | am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbreadJoe Onorato2010-10-141-4/+35
|\ \ \ \ | |/ / /
| * | | Screen on/off animation tweaksJoe Onorato2010-10-141-4/+35
* | | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-8/+32
|\ \ \ \ | |/ / /
| * | | Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-8/+32
| |\ \ \
| | * | | OBB: use PBKDF2 for key generation.Kenny Root2010-10-131-8/+32