summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* Expose (internally only) the number of animations currently running.Brad Fitzpatrick2010-10-221-0/+12
* resolved conflicts for merge of 9c7489f8 to masterDianne Hackborn2010-10-221-9/+1
|\
| * am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbreadDianne Hackborn2010-10-221-9/+1
| |\
| | * Fix issue #3122240: Expose xlarge in GB.Dianne Hackborn2010-10-221-9/+1
| * | am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-211-0/+19
| |\ \ | | |/
| | * Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-211-0/+19
* | | am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earl...Brad Fitzpatrick2010-10-191-2/+2
|\ \ \ | |/ /
| * | am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gi...Brad Fitzpatrick2010-10-191-2/+2
| |\ \ | | |/
| | * Fix Vibrator permission CTS test broken earlier.Brad Fitzpatrick2010-10-191-2/+2
| * | am 3d2818d3: Remove public resource padding.Dianne Hackborn2010-10-181-1/+1
| |\ \ | | |/
| | * Remove public resource padding.Dianne Hackborn2010-10-181-1/+1
* | | am c9cff071: am b4157a43: Merge "StrictMode: fix docs to actually compile and...Brad Fitzpatrick2010-10-191-1/+19
|\ \ \ | |/ /
| * | am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utilit...Brad Fitzpatrick2010-10-181-1/+19
| |\ \ | | |/
| | * StrictMode: fix docs to actually compile and add a utility method.Brad Fitzpatrick2010-10-181-1/+19
* | | Remove public resource padding.Dianne Hackborn2010-10-191-1/+1
* | | am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to ...Dianne Hackborn2010-10-181-2/+22
|\ \ \ | |/ /
| * | am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UI...Dianne Hackborn2010-10-151-2/+22
| |\ \ | | |/
| | * Work on issue #3101415: Crespo apps seem to have their UID changed over time.Dianne Hackborn2010-10-151-2/+22
| * | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-151-0/+6
| |\ \ | | |/
| | * Merge "NFC: Move NFC service implementation out of system_server." into ginge...Nick Pelly2010-10-151-0/+6
| | |\
| | | * NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-151-0/+6
* | | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-171-0/+6
* | | | am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot....Brad Fitzpatrick2010-10-161-2/+20
|\ \ \ \ | |/ / /
| * | | am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into ginger...Brad Fitzpatrick2010-10-151-2/+20
| |\ \ \ | | |/ /
| | * | Don't crash on null Vibrator during reboot.Brad Fitzpatrick2010-10-141-2/+20
| | |/
* | | am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality...Kenny Root2010-10-151-3/+3
|\ \ \ | |/ /
| * | am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into ginger...Kenny Root2010-10-131-3/+3
| |\ \ | | |/
| | * OBB: Change documentation to reflect realityKenny Root2010-10-131-3/+3
* | | am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for responsive...Brad Fitzpatrick2010-10-131-1/+4
|\ \ \ | |/ /
| * | am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs...Brad Fitzpatrick2010-10-121-1/+4
| |\ \ | | |/
| | * Merge "StrictMode: link to designing for responsiveness ANR docs" into ginger...Brad Fitzpatrick2010-10-121-1/+4
| | |\
| | | * StrictMode: link to designing for responsiveness ANR docsBrad Fitzpatrick2010-10-111-1/+4
* | | | resolved conflicts for merge of 8bb7a1df to masterKenny Root2010-10-134-75/+151
|\ \ \ \ | |/ / /
| * | | am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-114-75/+151
| |\ \ \ | | |/ /
| | * | OBB: rearrange to be entirely asynchronousKenny Root2010-10-114-75/+151
| | |/
* | | Merge "Add API to check for emulated external storage"Kenny Root2010-10-122-6/+69
|\ \ \
| * | | Add API to check for emulated external storageKenny Root2010-10-122-6/+69
* | | | am 3a4b7dfd: am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earl...Brad Fitzpatrick2010-10-121-8/+25
|\ \ \ \ | | |/ / | |/| |
| * | | am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before a...Brad Fitzpatrick2010-10-111-8/+25
| |\ \ \ | | | |/ | | |/|
| | * | StrictMode: check max-offenses-per-loop earlier, before allocationsBrad Fitzpatrick2010-10-111-8/+25
* | | | am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aospJean-Baptiste Queru2010-10-111-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | resolved conflicts for merge of c2894474 to gingerbread-plus-aospJean-Baptiste Queru2010-10-101-0/+1
| |\ \
| | * | Support showing "Cold" battery health.Imre Sunyi2010-10-101-0/+1
* | | | am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process"...Dianne Hackborn2010-10-101-0/+4
|\ \ \ \ | |/ / /
| * | | am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerb...Dianne Hackborn2010-10-081-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fix issue #3074745: Crash in system process" into gingerbreadDianne Hackborn2010-10-081-0/+4
| | |\ \
| | | * | Fix issue #3074745: Crash in system processDianne Hackborn2010-10-081-0/+4
* | | | | am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" i...Brad Fitzpatrick2010-10-101-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbreadBrad Fitzpatrick2010-10-081-1/+2
| |\ \ \ \ | | |/ / /
| | * | | DropBoxManager.Entry implements CloseableBrad Fitzpatrick2010-10-081-1/+2
| | |/ /