summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Add support for heavy-weight applications.Dianne Hackborn2010-06-043-0/+69
* am ee1cdd0e: merge from open-source masterThe Android Open Source Project2010-05-191-0/+3
|\
| * merge from open-source masterThe Android Open Source Project2010-05-191-0/+3
| |\
| | * Don't allow invalid Uris to be added as observers.Anthony Newnam2010-05-191-0/+3
* | | am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" int...Costin Manolache2010-05-121-1/+1
|\ \ \ | |/ /
| * | Bug 2680071: Rename the Cloud to DeviceCostin Manolache2010-05-121-1/+1
* | | am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyoCostin Manolache2010-05-121-1/+1
|\ \ \ | |/ /
| * | Bug 2673557: rename datamessagingCostin Manolache2010-05-101-1/+1
* | | Fix build.Dianne Hackborn2010-04-291-2/+2
* | | New xlarge screen size.Dianne Hackborn2010-04-284-17/+73
* | | am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execut...Vasu Nori2010-04-281-0/+2
|\ \ \ | |/ /
| * | bug:2622719 move 'forcing of cursor execution' to ContentProviderVasu Nori2010-04-281-0/+2
* | | am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caus...Fred Quintana2010-04-281-5/+1
|\ \ \ | |/ /
| * | Merge "revert a change in the SyncManager that caused it to not cancel long r...Fred Quintana2010-04-281-5/+1
| |\ \
| | * | revert a change in the SyncManager that caused it to not cancelFred Quintana2010-04-271-5/+1
* | | | am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252"...Fred Quintana2010-04-272-3/+181
|\ \ \ \ | |/ / /
| * | | Merge "Add JavaDoc for SyncResult http://b/2420252" into froyoFred Quintana2010-04-272-3/+181
| |\ \ \
| | * | | Add JavaDoc for SyncResultFred Quintana2010-04-272-3/+181
| | |/ /
* | | | am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expo...Dianne Hackborn2010-04-271-1/+1
|\ \ \ \ | |/ / /
| * | | Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGEDianne Hackborn2010-04-261-1/+1
* | | | resolved conflicts for merge of 5a8f877c to krakenDianne Hackborn2010-04-271-5/+10
|\ \ \ \ | |/ / /
| * | | Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGEDianne Hackborn2010-04-261-8/+10
| |/ /
* | | Logo attribute for manifest and PackageManager methods to fetch itAdam Powell2010-04-234-8/+163
* | | am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that ar...Suchi Amalapurapu2010-04-201-4/+0
|\ \ \ | |/ /
| * | Fix 2610961Suchi Amalapurapu2010-04-201-4/+0
* | | am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." i...Dan Egnor2010-04-081-2/+2
|\ \ \ | |/ /
| * | Merge "Missed these ones in the previous rename." into froyoDan Egnor2010-04-081-2/+2
| |\ \
| | * | Missed these ones in the previous rename.Brad Fitzpatrick2010-04-081-2/+2
* | | | am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyoBrad Fitzpatrick2010-04-081-3/+3
|\ \ \ \ | |/ / /
| * | | Rename logtag for clarity.Brad Fitzpatrick2010-04-081-3/+3
| |/ /
* | | am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of d...Robert Greenwalt2010-04-081-1/+12
|\ \ \ | |/ /
| * | Add service to monitor/control the flow of data.Robert Greenwalt2010-04-081-1/+12
* | | am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to ...Suchi Amalapurapu2010-04-071-0/+3
|\ \ \ | |/ /
| * | Fix 2579461Suchi Amalapurapu2010-04-071-0/+3
* | | am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaSc...Ray Chen2010-04-071-2/+1
|\ \ \ | |/ /
| * | Merge "Per requested by API council, rename MediaScannerConneciton.ScanResult...Ray Chen2010-04-071-2/+1
| |\ \
| | * | Per requested by API council, rename MediaScannerConneciton.ScanResultListene...Ray Chen2010-04-071-2/+1
* | | | am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server cras...Dianne Hackborn2010-04-071-2/+2
|\ \ \ \ | |/ / /
| * | | Maybe fix issue #2568615: System server crashed in SyncStorageEngineDianne Hackborn2010-04-071-2/+2
| |/ /
* | | am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APKDianne Hackborn2010-04-051-0/+3
|\ \ \ | |/ /
| * | 2568467 System crash when installing corrupt APKDianne Hackborn2010-04-051-0/+3
* | | am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Ins...Dianne Hackborn2010-04-051-7/+33
|\ \ \ | |/ /
| * | Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyoDianne Hackborn2010-04-051-7/+33
| |\ \
| | * | Fix issue #2564479: Favorite Recipes App Installation FailDianne Hackborn2010-04-021-7/+33
* | | | am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens...Dan Morrill2010-04-051-0/+8
|\ \ \ \ | |/ / /
| * | | Adding a feature definition for touchscreens that was overlooked in the lastDan Morrill2010-04-051-0/+8
| |/ /
* | | am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activitie...Dianne Hackborn2010-04-021-1/+8
|\ \ \ | |/ /
| * | Add a new intent category used for activities running in carmode.Bernd Holzhey2010-04-021-1/+8
* | | resolved conflicts for merge of d9ee01a9 to krakenJeff Brown2010-03-304-27/+81
|\ \ \ | |/ /
| * | Show SD unavailable icon for apps on SD when ejected.Jeff Brown2010-03-304-27/+81