summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-01-268-13/+27
| | | | Change-Id: I9ecc6b7fd129f9b430d96e4d65c656a2b71bd0af
* am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" ↵Scott Main2012-01-252-2/+0
|\ | | | | | | | | | | | | into ics-mr1 * commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23': docs: remove the 1.0 icon template pack
| * am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1Scott Main2012-01-252-2/+0
| |\ | | | | | | | | | | | | * commit '9ac4dd828065410efbb380992d996c7e93daf437': docs: remove the 1.0 icon template pack
| | * Merge "docs: remove the 1.0 icon template pack" into ics-mr1Scott Main2012-01-252-2/+0
| | |\
| | | * docs: remove the 1.0 icon template packScott Main2012-01-252-2/+0
| | | | | | | | | | | | | | | | Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
* | | | am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to ↵Scott Main2012-01-256-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | conserve site space" into ics-mr1 * commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b': docs: remove ADL presentation PDFs to conserve site space
| * | | am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site ↵Scott Main2012-01-256-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | space" into ics-mr1 * commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db': docs: remove ADL presentation PDFs to conserve site space
| | * | Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1Scott Main2012-01-256-0/+0
| | |\ \ | | | |/
| | | * docs: remove ADL presentation PDFs to conserve site spaceScott Main2012-01-256-0/+0
| | | | | | | | | | | | | | | | Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
* | | | am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topicsJoe Malin2012-01-254-914/+2532
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320': DOC CHANGE: New Content Provider topics
| * | | am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topicsJoe Malin2012-01-254-914/+2532
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2': DOC CHANGE: New Content Provider topics
| | * | am a2a46f62: DOC CHANGE: New Content Provider topicsJoe Malin2012-01-254-914/+2532
| | |\ \ | | | |/ | | |/| | | | | | | | | * commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3': DOC CHANGE: New Content Provider topics
| | | * DOC CHANGE: New Content Provider topicsJoe Malin2012-01-234-914/+2532
| | | | | | | | | | | | | | | | Change-Id: Ib5507f4c9ecce3aea51cd39310e3f4990c9b3070
* | | | Merge "Fixing failing focus tests"Svetoslav Ganov2012-01-254-21/+42
|\ \ \ \
| * | | | Fixing failing focus testsSvetoslav Ganov2012-01-254-21/+42
| | | | | | | | | | | | | | | | | | | | Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
* | | | | Merge "Make sure WebView get notified before the EGL context destroyed."Teng-Hui Zhu2012-01-251-1/+1
|\ \ \ \ \
| * | | | | Make sure WebView get notified before the EGL context destroyed.Teng-Hui Zhu2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5639899 Change-Id: Id778cf3dac1d2f6d6b8014b7a911b51dc14fcc8a
* | | | | | Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."Dianne Hackborn2012-01-256-11/+38
|\ \ \ \ \ \
| * | | | | | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.Dianne Hackborn2012-01-256-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
* | | | | | | Merge "Unbalanced batch edit begin and end leave TextView unresponsive"Gilles Debunne2012-01-252-26/+72
|\ \ \ \ \ \ \
| * | | | | | | Unbalanced batch edit begin and end leave TextView unresponsiveGilles Debunne2012-01-172-26/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for http://code.google.com/p/android/issues/detail?id=17508 Adding some logs and a forced GC, I'm now reliably able to reproduce it. Here is the scenario. 1. The IME handles an event. It retrieves the current InputConnection (IC) using ic = getCurrentInputConnection() and calls ic.beginBatchEdit(); 2. The call is propagated to the UI thread and TextView's mBatchEditNesting is correctly increased through beginBatchEdit() 3. A listener calls setText(), which imm.restartInput(this); 4. As a result, the InputMethodManager creates a new ControlledInputConnectionWrapper with a new InputConnection from the TextView 5. A GC happens at that point. The previous InputConnection is no longeri referenced by the InputMethodManager's mServedInputConnection. The weak reference in the previous ControlledInputConnectionWrapper is nulled. 6. The IME thread finishes its process and calls ic.endBatchEdit(); on its version of the original InputConnection. 7. The message is passed through the InputConnect, but when the weak reference in the original IInputConnectionWrapper is dereferenced, we get a null InputConnection in executeMessage(). 8. As a result, the TextView's endBatchEdit() method is not called, leaving this TextView with a non zero mBatchEditNesting. 9. From now on, all edit actions on this TextView will be considered part of a nested edition and no invalidation is performed, which is the visible manifestation of this bug. The core problem is that the begin/end batch edit contract is broken when: 1. These are initiated by the IME thread (as opposed to the UI thread) 2. The input connection is reset between these calls 3. A GC happens in the mean time and the WeakReference is lost (otherwise calling endBatchEdit on a no longer active InputConnection is fine Solution to keep TextView's mBatchEditNesting balanced: - The IMM should notify the IC when it is no longer used. We're using the existing FINISH_INPUT_CONNECTION to do that. - The InputConnection should keep track of its nesting contribution to the TextView. When finished the IC makes sure its contribution is reset to 0. Moreover, further asynchonous calls to begin/endBatchEdit that may arrive from the IME should be ignored. This is achieved using a negative value as a flag. Notes: - finishComposingText may be too broad of a method to perform such a cleaning step but is seems to only be called in cases where the IC will not be used anymore. If that's too broad, we have to introduce a new method in the IC interface. - This is has been implemented in EditableInputConnection and not in a more general BaseInputConnection because this is where we have a notion of TextEdit, and the nesting problem is here specific to TextView. However, the same unbalanced begin/end problem will happen in these classes. They should override finishComposingText as has been done here if that matters. - We cannot re-use the TextView's mBatchEditNesting since it may take into account batch edit from various sources and resetting it on InputConnection close could then lead to an inconsistent negative count value. Patch Set 2: added synchronized blocks around mBatchEditNesting Change-Id: I1ec5518fdc16fb0551fbce9d13f5d92eb4bc78c0
* | | | | | | | Merge "Update Javadoc for InputConnection.deleteSurroundingText()"Fabrice Di Meglio2012-01-251-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Javadoc for InputConnection.deleteSurroundingText()Fabrice Di Meglio2012-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - give more precision about how the text is considered Change-Id: Ie2f09bb3338e7dc0e98da0595d1500a6352d09d3
* | | | | | | | | Merge "TextView's display list updated on layout"Gilles Debunne2012-01-251-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | TextView's display list updated on layoutGilles Debunne2012-01-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5903021 We need to invalidate the DL at anytime the layout is changed. Change-Id: Ief06c988b88cdf1b35fe8ce9bac1243326ea44c4
* | | | | | | | | | Merge "Add additional debug"Wink Saville2012-01-251-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add additional debugWink Saville2012-01-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ConnectivityService#startUsingNetworkFeature is called and the special network is not available output some additional information. Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
* | | | | | | | | | | Merge "Fix ClassCastException"Wink Saville2012-01-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix ClassCastExceptionWink Saville2012-01-251-1/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In "Change I95ed2aae: Stop using shared DUN APN when tethering stops", sha1: 8beff9586ff89a1e59469e9820fd9e9d704300d2, an assumption is made that the msg.obj is always an ApnContext, this is not true for CDMA. Eventually we plan on removing the destinction between GSM and CDMA but for now we need to handle it handle it. Bug: 5904734 Change-Id: I86873dc7aeda5234c14a6fe1e4ec7345ee30e957
* | | | | | | | | | | Improve NDEF API'sNick Pelly2012-01-256-133/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Add NdefRecord.toMimeType() Maps the record to a MIME type o Add NdefRecord.toUri() Maps the record to a URI o Add hidden NfcAdapter.dispatch() Helps test the dispatch path. o Modify createMime(), createUri() and createExternal(): Do not try and strictly follow RFC requirements for URI or MIME content types. This just leads to heartbreak - the RFC requirements are too strict. For example RFC1341 forbids the use of '.' in a MIME type, however this is in common use in types such as "application/vnd.companyname". I think the best approach is to only remove 'obvious' whitespace issues, and to convert uppercase to lowercase as per Android guidelines. Change-Id: Id686f5f3b05b2dceafad48e1cfcbdb2b3890b854
* | | | | | | | | | | Merge "Add API's for normalizing MIME's and URI's."Nick Pelly2012-01-253-23/+189
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add API's for normalizing MIME's and URI's.Nick Pelly2012-01-243-23/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helps developers create well-behaved intents: - lower case MIME data type - strip parameters from MIME content types - lowercase URI scheme The new API's are normalizeAndSetType() normalizeAndSetData() normalizeAndSetDataAndType() Uri.normalize() normalizeMimeType() Change-Id: Ib5c907897f39b1f705bcc4c9103ba1e6f316380b
* | | | | | | | | | | Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."Dianne Hackborn2012-01-254-5/+66
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added JELLY_BEAN version name; update some targetSdkVersion docs.Dianne Hackborn2012-01-254-5/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia38ff5b9ad2b63c2cf667260881222d9ff168052
* | | | | | | | | | | | Merge "Fix an inconsistent comment."Jeff Brown2012-01-251-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix an inconsistent comment.Jeff Brown2012-01-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae40dfcca091c9886a05e483f51596c96014e57f
* | | | | | | | | | | | | am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." ↵Robert Greenwalt2012-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '109533519153307b10e2b3ae327ca4b4cd0c75d3': Filter our v6 address from tethering dns.
| * | | | | | | | | | | am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1Robert Greenwalt2012-01-251-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2': Filter our v6 address from tethering dns.
| | * | | | | | | | | | Merge "Filter our v6 address from tethering dns." into ics-mr1Robert Greenwalt2012-01-251-2/+14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Filter our v6 address from tethering dns.Robert Greenwalt2012-01-241-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't support IPv6 yet, and the tools crash when they see one, so filter them out. bug:5913888 Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
* | | | | | | | | | | | | am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type ↵Jean-Baptiste Queru2012-01-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definitions for 64 bit platforms" * commit '95306d85005f165e10a25ad45cadadec6e1f6a31': stagefright aacenc: Fix type definitions for 64 bit platforms
| * | | | | | | | | | | | am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions ↵Jean-Baptiste Queru2012-01-251-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 64 bit platforms" * commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3': stagefright aacenc: Fix type definitions for 64 bit platforms
| | * \ \ \ \ \ \ \ \ \ \ \ am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit ↵Jean-Baptiste Queru2012-01-251-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms" * commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3': stagefright aacenc: Fix type definitions for 64 bit platforms
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"Jean-Baptiste Queru2012-01-251-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | stagefright aacenc: Fix type definitions for 64 bit platformsMartin Storsjo2012-01-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also don't require LINUX to be defined, enable the MSVC typedefs only within _MSC_VER. This fixes a lot of warnings about dereferencing pointer 'winPtr' breaking strict aliasing rules. Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
* | | | | | | | | | | | | | | | Merge "Update AudioTrack.stop() javadoc"Jean-Michel Trivi2012-01-251-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update AudioTrack.stop() javadocJean-Michel Trivi2012-01-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information on the behavior of android.media.AudioTrack.stop() Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
* | | | | | | | | | | | | | | | | am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar ↵Roman Nurik2012-01-254-17/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes" into ics-mr1 * commit '92aaf2431ccb8d5ef1eb456646742c736fa70266': docs: Android Design typo and grammar fixes
| * | | | | | | | | | | | | | | | am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1Roman Nurik2012-01-244-17/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf077fdd79853dd4778598a623dc2f469c1a8934': docs: Android Design typo and grammar fixes
| | * | | | | | | | | | | | | | | Merge "docs: Android Design typo and grammar fixes" into ics-mr1Roman Nurik2012-01-244-17/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-01-25 11:52:54 +0000