summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
Commit message (Expand)AuthorAgeFilesLines
* Merge "Introduce new URI to clear data usage information"Makoto Onuki2012-04-131-1/+9
|\
| * Introduce new URI to clear data usage informationMakoto Onuki2012-04-131-1/+9
* | Merge "Mapping from DownloadManager status to string."Jeff Sharkey2012-04-131-0/+31
|\ \
| * | Mapping from DownloadManager status to string.Jeff Sharkey2012-04-131-0/+31
* | | Depcrecate increment function (should have been done back in ICS)Daniel Lehmann2012-04-131-0/+4
| |/ |/|
* | Merge "Add documentation about clearing usage stats"Makoto Onuki2012-04-121-1/+7
|\ \
| * | Add documentation about clearing usage statsMakoto Onuki2012-04-121-1/+7
| |/
* | The new APIs for the bookmarks, history and images.Tao Bai2012-04-121-5/+186
|/
* Merge "Expose NORMALIZED_NUMBER in the API"Daniel Lehmann2012-04-061-5/+3
|\
| * Expose NORMALIZED_NUMBER in the APIDaniel Lehmann2012-03-091-5/+3
* | Fixes a bug in migration of lock settings to LockSettingsService.Amith Yamasani2012-04-061-1/+5
* | Lockscreen settings per userAmith Yamasani2012-04-051-0/+28
* | resolved conflicts for merge of bff6a514 to masterJustin Koh2012-04-041-6/+15
|\ \
| * | Persists the master mute volume setting.Justin Koh2012-04-031-6/+15
| * | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-2/+2
| |\ \
| * \ \ am 52bfc243: docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-1/+1
| |\ \ \
| * \ \ \ am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1Wink Saville2012-01-041-3/+12
| |\ \ \ \
| * \ \ \ \ am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE,...Joe Fernandez2011-12-221-0/+7
| |\ \ \ \ \
| * \ \ \ \ \ am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1Irfan Sheriff2011-12-071-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of ea25ea7e to ics-aahJason Simmons2011-12-071-0/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE...Daniel Sandler2011-12-011-22/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of be6ab576 to ics-aahJeff Brown2011-11-291-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1Daniel Sandler2011-11-191-8/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1Daisuke Miyakawa2011-11-141-0/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of faa81c82 to ics-aahJason Simmons2011-11-102-19/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1Dave Santoro2011-11-091-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 604019c8: Merge "Fix build." into ics-mr1Robert Greenwalt2011-11-081-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1Robert Greenwalt2011-11-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1366c756 to ics-aahJason Simmons2011-11-082-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics...Flavio Lerda2011-11-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery f...Wink Saville2011-11-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" ...Tom Taylor2011-10-311-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merged by hand (services/java/com/android/server/PowerManagerService.java nee...Ed Heyl2011-10-311-45/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Save and restore master volume in the settings providerMike Lockwood2011-10-281-0/+6
| * | | | | | | | | | | | | | | | | | | | | SettingsProvider: Add support for overriding lockscreen.disabled default valueMike Lockwood2011-10-281-0/+6
* | | | | | | | | | | | | | | | | | | | | | Added a setting for whether biometric weak liveliness is enabled.Danielle Millett2012-03-221-0/+8
* | | | | | | | | | | | | | | | | | | | | | Remove unused android.net.Downloads.Jeff Sharkey2012-03-201-0/+16
* | | | | | | | | | | | | | | | | | | | | | Add support for CMAS warning notifications over CDMA.Jake Hamby2012-03-131-4/+24
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix obvious typos under frameworks/base/core"Ken Wakasa2012-03-092-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix obvious typos under frameworks/base/coreKen Wakasa2012-03-092-4/+4
* | | | | | | | | | | | | | | | | | | | | | | Merge "Enhancements for avoiding poor connection on wifi"Irfan Sheriff2012-03-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Enhancements for avoiding poor connection on wifiIrfan Sheriff2012-03-081-0/+8
* | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Fix incorrect javadocCasey Ho2012-03-021-3/+3
* | | | | | | | | | | | | | | | | | | | | Add a displayColor column to view_eventsAlon Albert2012-03-021-0/+11
* | | | | | | | | | | | | | | | | | | | | Merge "Improve Wi-Fi hand-off"Irfan Sheriff2012-02-291-43/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Improve Wi-Fi hand-offIrfan Sheriff2012-02-291-43/+12
* | | | | | | | | | | | | | | | | | | | | | Revert "Add support for CMAS warning notifications over CDMA." I'll submit ag...Jake Hamby2012-02-291-24/+4
* | | | | | | | | | | | | | | | | | | | | | Add support for CMAS warning notifications over CDMA.Jake Hamby2012-02-281-4/+24
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |