summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Expand)AuthorAgeFilesLines
* am dd954212: am a5861743: Merge "Fix issue #3418265: Rotation animation on wa...Dianne Hackborn2011-02-032-30/+98
|\
| * am a5861743: Merge "Fix issue #3418265: Rotation animation on wallpaper is br...Dianne Hackborn2011-02-022-30/+98
| |\
| | * Fix issue #3418265: Rotation animation on wallpaper is brokenDianne Hackborn2011-02-022-30/+98
* | | Merge "Stop using netmask in the framework."Robert Greenwalt2011-02-031-19/+13
|\ \ \
| * | | Stop using netmask in the framework.Robert Greenwalt2011-02-031-19/+13
* | | | Merge "Bind addr and prefixLength together in LinkAddress"Robert Greenwalt2011-02-032-6/+24
|\ \ \ \ | |/ / /
| * | | Bind addr and prefixLength together in LinkAddressRobert Greenwalt2011-01-282-6/+24
* | | | Merge "Remove defunct secure FS work"Kenny Root2011-02-032-74/+17
|\ \ \ \
| * | | | Remove defunct secure FS workKenny Root2011-02-022-74/+17
* | | | | Merge changes I80558c62,I6587f580Mike Lockwood2011-02-031-9/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | UsbService: Blacklist HID boot subclass devices (keyboards and mice)Mike Lockwood2011-02-011-13/+22
| * | | | UsbService: Add support for blacklisting certain USB bussesMike Lockwood2011-02-011-0/+23
* | | | | am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size break...Dianne Hackborn2011-02-021-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails....Dianne Hackborn2011-02-021-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix issue #3415137: New wallpaper size breaks thumbnails.Dianne Hackborn2011-02-021-0/+3
* | | | | am a70154b0: am c623fff0: Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-02-011-6/+9
|\ \ \ \ \ | |/ / / /
| * | | | am c623fff0: Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-01-311-6/+9
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-01-311-6/+9
| | |\ \ \
| | | * | | Fix keyboard hidden flag.Jeff Brown2011-01-311-6/+9
* | | | | | am db569b49: am 6cf32312: Merge "Do not check features in PackageManagerServi...Dianne Hackborn2011-02-011-20/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am 6cf32312: Merge "Do not check features in PackageManagerService" into hone...Dianne Hackborn2011-01-311-20/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Do not check features in PackageManagerService" into honeycombDianne Hackborn2011-01-311-20/+0
| | |\ \ \
| | | * | | Do not check features in PackageManagerServiceKenny Root2011-01-311-20/+0
| | | |/ /
* | | | | am c253fc0f: am 076d059b: Merge "Not to update IME when Settings version is o...satok2011-01-311-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | am 076d059b: Merge "Not to update IME when Settings version is older than the...satok2011-01-311-0/+17
| |\ \ \ \ | | |/ / /
| | * | | Not to update IME when Settings version is older than the last updated version.satok2011-02-011-0/+17
| | |/ /
* | | | am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the ...Joe Onorato2011-01-301-0/+10
|\ \ \ \ | |/ / /
| * | | am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI pro...Joe Onorato2011-01-301-0/+10
| |\ \ \ | | |/ /
| | * | Check for the STATUS_BAR permission for the system UI properties.Joe Onorato2011-01-301-0/+10
| | * | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-302-1/+9
| | |\ \
| | | * \ am 138757db: Merge "Make OBB results a one-way call" into gingerbreadKenny Root2011-01-291-1/+1
| | | |\ \
| | | * \ \ am 91c459ec: Copy user info from PackageSetting as wellKenny Root2011-01-261-0/+8
| | | |\ \ \
* | | | \ \ \ resolved conflicts for merge of c608e106 to masterJeff Brown2011-01-303-3/+99
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME butt...Jeff Brown2011-01-303-3/+99
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add "Use physical keyboard" option to system bar IME button." into hon...Jeff Brown2011-01-303-3/+99
| | |\ \ \ \ \
| | | * | | | | Add "Use physical keyboard" option to system bar IME button.Jeff Brown2011-01-283-3/+99
* | | | | | | | am bdaee964: am e97a12e3: Fix screen size compatibility mode.Dianne Hackborn2011-01-301-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e97a12e3: Fix screen size compatibility mode.Dianne Hackborn2011-01-301-7/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix screen size compatibility mode.Dianne Hackborn2011-01-301-7/+7
* | | | | | | | am 4e3f3a20: am 8710e76a: Follow up change to I741642acKen Wakasa2011-01-291-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8710e76a: Follow up change to I741642acKen Wakasa2011-01-291-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Follow up change to I741642acKen Wakasa2011-01-301-1/+2
* | | | | | | | am d4796c82: am a2e765ef: Merge "Update the encryption password when the devi...Jason parks2011-01-291-8/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a2e765ef: Merge "Update the encryption password when the device password i...Jason parks2011-01-291-8/+39
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Update the encryption password when the device password is changed." i...Jason parks2011-01-291-8/+39
| | |\ \ \ \ \ \
| | | * | | | | | Update the encryption password when the device password is changed.Jason parks2011-01-281-8/+39
* | | | | | | | | am f163b4d3: am e40dea0d: Fix a bug that IME switch disappiers at switching I...satok2011-01-291-1/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype.satok2011-01-291-1/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix a bug that IME switch disappiers at switching IME subtype.satok2011-01-301-1/+8
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "Enable global (cross-application) drag/drop"Christopher Tate2011-01-281-2/+1
|\ \ \ \ \ \ \ \