summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Merge "Incorporated Joe's comments"Manuel Roman2010-08-091-22/+19
|\
| * Incorporated Joe's commentsManuel Roman2010-08-091-22/+19
* | Removing closed cursor on stopDmitri Plotnikov2010-08-091-1/+1
|/
* Add new ContentProvider for doing conversions to data streams.Dianne Hackborn2010-08-089-51/+663
* resolved conflicts for merge of a06ad953 to masterChung-yih Wang2010-08-061-0/+9
|\
| * am 7324489f: Merge "Add SIP service into system server." into gingerbreadChung-yih Wang2010-08-051-0/+9
| |\
| | * Merge "Add SIP service into system server." into gingerbreadChung-yih Wang2010-08-051-0/+9
| | |\
| | | * Add SIP service into system server.Chung-yih Wang2010-08-061-0/+9
* | | | am c2a836a5: am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() t...Fred Quintana2010-08-051-1/+1
|\ \ \ \ | |/ / /
| * | | am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on...Fred Quintana2010-08-051-1/+1
| |\ \ \ | | |/ /
| | * | am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implemen...Fred Quintana2010-08-051-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge "Changed SyncOperation.toKey() to not rely on the implementation of Acc...Fred Quintana2010-08-051-1/+1
| | | |\
| | | | * Changed SyncOperation.toKey() to not rely on the implementation ofFred Quintana2010-08-051-1/+1
* | | | | First pass at a new clipboard API.Dianne Hackborn2010-08-055-0/+462
* | | | | am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; ...Scott Main2010-08-051-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to r...Scott Main2010-08-041-1/+3
| |\ \ \ \ | | |/ / /
| | * | | am 8dd87ad9: fix some doc errors in the resources; add link to resource docs ...Scott Main2010-08-041-1/+3
| | |\ \ \ | | | |/ /
| | | * | fix some doc errors in the resources;Scott Main2010-08-041-1/+3
* | | | | am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flig...Kenny Root2010-08-052-1/+14
|\ \ \ \ \ | |/ / / /
| * | | | am c68bcc32: Merge "Only allow one movePackage operation in-flight" into ging...Kenny Root2010-08-042-1/+14
| |\ \ \ \ | | |/ / /
| | * | | Only allow one movePackage operation in-flightKenny Root2010-08-042-1/+14
* | | | | Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown"Manuel Roman2010-08-041-0/+33
|\ \ \ \ \
| * | | | | add shutdown() to ContentProvider & call in ProviderTestCase*.tearDownVasu Nori2010-08-041-0/+33
* | | | | | requery() return value should be checkedVasu Nori2010-08-041-1/+3
* | | | | | Add android:hardwareAccelerated to Activity.Romain Guy2010-08-043-21/+22
|/ / / / /
* | | | | Adding a method called when detecting content change.Makoto Onuki2010-08-031-4/+14
* | | | | add public method in ContentValues to return set of all keysVasu Nori2010-08-021-0/+9
* | | | | am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gin...Kenny Root2010-08-021-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 739cdab7: Merge "Do not deference before null check" into gingerbreadKenny Root2010-08-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Do not deference before null checkKenny Root2010-08-021-1/+1
* | | | | Merge "More readable Configuration#toString() output."Daniel Sandler2010-07-301-5/+12
|\ \ \ \ \
| * | | | | More readable Configuration#toString() output.Daniel Sandler2010-07-221-5/+12
* | | | | | am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for d...Steve Howard2010-07-301-0/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 7c600369: Merge "Update Context.getSystemService() docs for download manag...Steve Howard2010-07-301-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Update Context.getSystemService() docs for download manager." into gin...Steve Howard2010-07-301-0/+4
| | |\ \ \ \
| | | * | | | Update Context.getSystemService() docs for download manager.Steve Howard2010-07-281-0/+4
* | | | | | | am 8190f485: am b350bec5: am 17876aa5: Minor changes to ContentProvider javad...Dan Egnor2010-07-281-11/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve...Dan Egnor2010-07-281-11/+12
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.Dan Egnor2010-07-281-11/+12
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Minor changes to ContentProvider javadoc to improve consistency.Dan Egnor2010-07-281-11/+12
* | | | | | Add new system service CountryDetectorBai Tao2010-07-281-1/+10
* | | | | | am a4ab2651: am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ...Brad Fitzpatrick2010-07-271-59/+119
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvid...Brad Fitzpatrick2010-07-271-59/+119
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentat...Brad Fitzpatrick2010-07-271-59/+119
| | |\ \ \ \ | | | |/ / /
| | | * | | COMMENT ONLY change to clarify ContentProvider documentation.Dan Egnor2010-07-271-59/+119
| | | | |/ | | | |/|
* | | | | am 55020622: am 7feab347: Merge "Un-@hide new download manager public API." i...Steve Howard2010-07-271-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 7feab347: Merge "Un-@hide new download manager public API." into gingerbreadSteve Howard2010-07-271-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Un-@hide new download manager public API.Steve Howard2010-07-261-1/+0
* | | | | Moved context modes into view, renamed to action modesAdam Powell2010-07-261-22/+0
* | | | | am 3a2ff74f: am 46730fc7: Fix handling of application disabled state.Dianne Hackborn2010-07-261-0/+10
|\ \ \ \ \ | |/ / / /