summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and ↵Dirk Dougherty2010-11-025-483/+1159
|\ | | | | | | | | | | | | permissions docs." into froyo * commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac': Doc change: Update uses-feature and permissions docs.
| * am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." ↵Dirk Dougherty2010-11-025-483/+1159
| |\ | | | | | | | | | | | | | | | | | | into froyo * commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f': Doc change: Update uses-feature and permissions docs.
| | * Merge "Doc change: Update uses-feature and permissions docs." into froyoDirk Dougherty2010-11-025-483/+1159
| | |\
| | | * Doc change: Update uses-feature and permissions docs.Dirk Dougherty2010-11-025-483/+1159
| | | | | | | | | | | | | | | | Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
* | | | am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"Brad Fitzpatrick2010-11-021-11/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '9df48a0305818122298a86ae9949f6688814928b': NotificationManager: droiddoc documentation improvements
| * \ \ \ Merge "NotificationManager: droiddoc documentation improvements"Brad Fitzpatrick2010-11-021-11/+14
| |\ \ \ \
| | * | | | NotificationManager: droiddoc documentation improvementsPeter Collingbourne2010-10-141-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, corrects and improves the overview and the documentation for the NotificationManager.notify(String, int, Notification) method to reflect the fact that the pair (tag, id) is used for notification matching. Change-Id: Ic088a56f457285523d90d296853685393b8c3412
* | | | | | am ef8a810b: Merge "Update of DRM framework"Gloria Wang2010-11-0225-566/+374
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ef8a810b3b11d177a64111125eaa44bb76624414': Update of DRM framework
| * | | | | Merge "Update of DRM framework"Gloria Wang2010-11-0225-566/+374
| |\ \ \ \ \
| | * | | | | Update of DRM frameworkTakeshi Aimi2010-11-0225-566/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
* | | | | | | am 38e561dd: Merge "Remove timeout support." into gingerbreadNick Pelly2010-11-024-60/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '38e561dd3cd72160035d8b3002fc9bbaf3071374': Remove timeout support.
| * | | | | | Merge "Remove timeout support." into gingerbreadNick Pelly2010-11-024-60/+0
| |\ \ \ \ \ \
| | * | | | | | Remove timeout support.Nick Pelly2010-11-024-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation was guarenteed to cause deadlock when a timeout was set. Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | | | am bbd212d7: Merge "Document per-implementation behaviors of native get* ↵Jean-Baptiste Queru2010-11-021-0/+44
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods" * commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1': Document per-implementation behaviors of native get* methods
| * | | | | | | Merge "Document per-implementation behaviors of native get* methods"Jean-Baptiste Queru2010-11-021-0/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Document per-implementation behaviors of native get* methodsDaniel Trebbien2010-11-021-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
* | | | | | | | | am 715f8610: Merge "Clarify documentation of Cursor get* methods."Jean-Baptiste Queru2010-11-021-16/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '715f86107763ee95e7d6558dd8da390a63da63e2': Clarify documentation of Cursor get* methods.
| * | | | | | | | Merge "Clarify documentation of Cursor get* methods."Jean-Baptiste Queru2010-11-021-16/+32
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Clarify documentation of Cursor get* methods.Daniel Trebbien2010-11-021-16/+32
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make clear in the Javadoc comments of the `Cursor` get* methods that implementations thereof can have implementation-defined behavior. In some cases, these changes actually correct the documentation. For example, in the case of `getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is *not* converted to a `short` via Short#valueOf or even in a functionally- equivalent manner. Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
* | | | | | | | Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" ↵Gloria Wang2010-11-022-24/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread-plus-aosp
| * \ \ \ \ \ \ \ resolved conflicts for merge of c1c45a4d to gingerbread-plus-aospGloria Wang2010-11-022-24/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
| | * | | | | | | Merge "- Move the business rule management down to DRM agents. - Do not ↵Gloria Wang2010-11-012-24/+14
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | register DRM sniffer because drmserver is not enabled."
| | | * | | | | | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not register DRM sniffer because drmserver is not enabled. Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
* | | | | | | | | am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index ↵Joe Malin2010-11-021-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page." into gingerbread * commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d': DOC CHANGE: Add entry for monkeyrunner to tools index page.
| * | | | | | | | Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into ↵Joe Malin2010-11-021-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | | | DOC CHANGE: Add entry for monkeyrunner to tools index page.Joe Malin2010-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a
* | | | | | | | | | am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into ↵Raphael2010-11-021-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd': Support for <compatible-screens><screen> in ADT.
| * | | | | | | | Merge "Support for <compatible-screens><screen> in ADT." into gingerbreadRaphael2010-11-021-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Support for <compatible-screens><screen> in ADT.Raphael2010-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: 3125910 Change-Id: I529a5f4e4ece3222495e3a0a78c80286483d218f
* | | | | | | | | am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-02186-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18149c47bfc87c88798e6820d7153e588b374ed3': Rescaled/updated mdpi assets added.
| * | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-02186-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rescaled/updated mdpi assets added.Gilles Debunne2010-11-01186-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd179b6850e04a785aef588c2f0f4fd80fc5c8fe
* | | | | | | | | | am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-0282-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94da7f983cc33d10bf1560bb32ec19400437a42a': Rescaled/updated mdpi assets added.
| * | | | | | | | | Merge "Rescaled/updated mdpi assets added." into gingerbreadGilles Debunne2010-11-0282-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rescaled/updated mdpi assets added.Gilles Debunne2010-11-0182-0/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idce2f1a3fb66565abe2c710281dab1ec6650d0c2
* | | | | | | | | | am a87ea46c: Fix bugs related to cheek event suppression.Jeff Brown2010-11-012-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d': Fix bugs related to cheek event suppression.
| * | | | | | | | | Fix bugs related to cheek event suppression.Jeff Brown2010-11-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues: 1. First, due to an inverted conditional in the input dispatcher, we were reporting touches as long touches and vice-versa to the power manager. 2. Power manager user activity cheek event suppression also suppresses touch events (but not long touch or up events). As a result, if cheek event suppression was enabled, touches would not poke the user activity timer. However due to the above logic inversion, this actually affected long touches. Net result, if cheek suppression was enabled in the power manager and you held your thumb on the screen long enough, the phone would go to sleep! Cheek event suppression is commonly turned on when making a phone call. Interestingly, it does not seem to get turned off afterward... This change fixes the logic inversion and exempts touches from the cheek suppression. The reason we do the latter is because the old behavior was actually harmful in other ways too: a touch down would be suppressed but not a long touch or the touch up. This would cause bizarre behavior if you touched the screen while it was dimmed. Instead of brightening immediately, it would brighten either when you lifted your finger or 300ms later, whichever came first. Bug: 3154895 Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
* | | | | | | | | | am 5dda76a7: Adding some StorageManager integration test infrastructure and ↵Neal Nguyen2010-11-019-0/+888
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some basic tests. * commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954': Adding some StorageManager integration test infrastructure and some basic tests.
| * | | | | | | | | Adding some StorageManager integration test infrastructure and some basic tests.Neal Nguyen2010-11-019-0/+888
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More interesting tests to come in the form of host-based tests. Change-Id: Ifdedf7ef26ed9889871c902af20164df0498cf07
* | | | | | | | | | am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.Neal Nguyen2010-11-012-6/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64': Cleaning up some more flakiness in DownloadManager tests.
| * | | | | | | | | Cleaning up some more flakiness in DownloadManager tests.Neal Nguyen2010-11-012-6/+11
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of logic fixes (synchronization, poll time), and adding a little more test logging info. Change-Id: I8da71f87fd1e211913f84ec517762dca81f87292
* | | | | | | | | am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7fda21c8298d8f316564280d702206147207005': DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
| * | | | | | | | DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-018-63/+2668
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
* | | | | | | | | am ccb75a88: Merge "Update the API file." into gingerbreadDan Bornstein2010-11-011-12/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3': Update the API file.
| * | | | | | | | Merge "Update the API file." into gingerbreadDan Bornstein2010-11-011-12/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update the API file.Dan Bornstein2010-11-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous change was api-compatible, but some of the incidental data in the API file (like parameter names) changed. It looks like there were probably a couple other similar changes too, that hadn't previously been propagated to the API file; all I did to generate this change was say "make update-api". Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
* | | | | | | | | | am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9': docs: update dashboard
| * | | | | | | | | am eda78cea: docs: update dashboardScott Main2010-11-011-19/+18
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83': docs: update dashboard
| | * | | | | | | | docs: update dashboardScott Main2010-11-011-19/+18
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
* | | | | | | | | am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbreadLeon Scroggins2010-11-013-0/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276': Update insertion handler for WebTextView.