summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1John Wang2011-11-141-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34': [maguro] Fix STK issues
| * | | | | | | | | | | Merge "[maguro] Fix STK issues" into ics-mr1John Wang2011-11-141-1/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [maguro] Fix STK issuesdujin.cha2011-11-141-1/+10
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix Bug 5574160 (Abnormal Setup menu) 2. Fix Bug 5558273 (GetInkey issue) 3. Fix BUg 5558612 (No default alpha id) 4. Fix Vodafone UK ALS issue. Bug : 5574160, 5558273, 5558612 Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf Signed-off-by: dujin.cha <dujin.cha@samsung.com>
* | | | | | | | | | | | am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of ↵Mathias Agopian2011-11-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | very large SurfaceTextures" into ics-mr1 * commit '738d8cae2239d194429676f2889cfae3c8f7ba08': Define, document, and test the behavior of very large SurfaceTextures
| * | | | | | | | | | Merge "Define, document, and test the behavior of very large ↵Mathias Agopian2011-11-141-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | SurfaceTextures" into ics-mr1
| | * | | | | | | | | Define, document, and test the behavior of very large SurfaceTexturesMathias Agopian2011-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateTexImage() now throws a runtime exception when its native counterpart fails Bug: 5506633 Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
* | | | | | | | | | | am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when ↵Mathias Agopian2011-11-146-2/+46
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discarding layers Bug #5581817" into ics-mr1 * commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3': Discard framebuffer rendering queues when discarding layers Bug #5581817
| * | | | | | | | | | Merge "Discard framebuffer rendering queues when discarding layers Bug ↵Mathias Agopian2011-11-146-2/+46
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | #5581817" into ics-mr1
| | * | | | | | | | | Discard framebuffer rendering queues when discarding layersRomain Guy2011-11-106-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5581817 Change-Id: If612846ec5f7793710fc4df152791fb32c506551
| * | | | | | | | | | am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1f0c873b1d119a19342cb67ca77b59607951659': Fix bug in TextLayoutCacheKey handling embedded nulls.
* | | | | | | | | | | am b22eec57: am a8743f15: Fix bug 5425280 - Two ActionBar icons show upAdam Powell2011-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b22eec57d559fc9dd5663abdc37d6b6e6a4f641f': Fix bug 5425280 - Two ActionBar icons show up
| * \ \ \ \ \ \ \ \ \ \ am a8743f15: Fix bug 5425280 - Two ActionBar icons show upAdam Powell2011-11-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a': Fix bug 5425280 - Two ActionBar icons show up
| | * | | | | | | | | | Fix bug 5425280 - Two ActionBar icons show upAdam Powell2011-11-111-1/+1
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
* | | | | | | | | | | Fix buildKristian Monsen2011-11-142-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
* | | | | | | | | | | Merge "Removing the ability to get native instrumentation as part of nav dump"Kristian Monsen2011-11-142-22/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Removing the ability to get native instrumentation as part of nav dumpKristian Monsen2011-11-112-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be able to remove ANDROID_INSTRUMENTATION code. Note that it would only print useful information if webcore was compiled with ANDROID_INSTRUMENTATION on. There is an open bug for problems with ANDROID_INSTRUMENTATION: http://b/issue?id=2816327 Needs Browser CL: https://android-git.corp.google.com/g/#/c/149442 Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
* | | | | | | | | | | am 0e4669c8: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e4669c81009cea51d9d7b42b7ff665f44e78aa6': Fix bug in TextLayoutCacheKey handling embedded nulls.
| * | | | | | | | | | am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | * commit 'f1f0c873b1d119a19342cb67ca77b59607951659': Fix bug in TextLayoutCacheKey handling embedded nulls.
| | * | | | | | | | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not passing the length of the UTF-16 string to String16::setTo. As a result, it was copying the contents of the text up to the first null it found. First problem, these strings are not typically null terminated! Second problem, if the string contained a null character, then we might truncate it. However, we only truncated the string when the copy constructor was invoked (say, when we called get() on the cache) but not in internalTextCopy() (before adding the key to the cache). As a result of the second problem, we would first search the cache for a key that matched a partially copied truncated string (potentially reading uninitialized memory that followed it). Finding none, we would add the entry to the cache using the correct key. If the cache already had a value associated with the correct key, then the put would fail, returning false. Charging ever onwards, we would add the size of the entry to the cache size. Proceeding in this manner, it was possible for the cache to believe it had less remaining space than it really did. At that point, it was possible for the cache to evict all entries and yet still not think it had room to add a new one, so it would continue trying to make space indefinitely. Bug: 5576812 Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
| | * | | | | | | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open anAdam Powell2011-11-112-2/+7
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow menu under invalid circumstances. Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
* | | | | | | | | Merge "Improve the logging in TextLayoutCache."Fabrice Di Meglio2011-11-112-75/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve the logging in TextLayoutCache.Jeff Brown2011-11-112-75/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also deleted some dead code. Change-Id: I1feb5744177ae751ff1417f49f3c45139a35246b
* | | | | | | | | | Merge "Added missing comments in Instrumentation#sendStringSync"Svetoslav Ganov2011-11-111-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added missing comments in Instrumentation#sendStringSyncSvetoslav Ganov2011-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib20c5f9763c4ff97dec02fbb79721da93e964bc7
* | | | | | | | | | | Merge "Instrumentation sendStringSync(String) may try to inject obsolete ↵Svetoslav Ganov2011-11-111-9/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | events."
| * | | | | | | | | | Instrumentation sendStringSync(String) may try to inject obsolete events.Svetoslav Ganov2011-11-111-9/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyEvents returned by KeyCharacterMap.getEvents() have the same time stamp and the system rejects too old events. Hence, it is possible for an event to become stale before it is injected if it takes too long to inject the preceding ones. Now the time of the event is set just before injecting it. Change-Id: I72b60d261f8bda857b331d0f1b1bd97f9f15def3
* | | | | | | | | | am 0fbd9eba: am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1Christopher Tate2011-11-111-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fbd9ebab891530290b4d52fd5e81f6b4d7278d8': XML parsing optimizations
| * | | | | | | | | XML parsing optimizationsChristopher Tate2011-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Traceview showed approximately 10% of total parse time inside the synthetic 'trampoline' methods generated to provide inner classes with access to their outer class's private fields. The bottleneck in this particular case is in XmlBlock and its inner class Parser. Making the bottlneck outer-class members and methods package-scope instead of private removes that 10% overhead being spent within these access trampolines. Traceview tends to overemphasize the significance of very small methods such as these trampolines. That said, the measured speed gain on the ParseLargeXmlResFg op due to this patch is between 5% and 6%. Change-Id: Ia0e3ae5408d1f9992b46e6e30dd2407090379b07
* | | | | | | | | | Merge "Seems to break text views all over. Particularly noticeable is that ↵Jeff Brown2011-11-111-7/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character."
| * | | | | | | | | | Seems to break text views all over. Particularly noticeable is that the ↵Jeff Brown2011-11-111-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character. Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" This reverts commit caa8c06de5f94db69faca35d666c04b82d3f420b
* | | | | | | | | | | am 0b554bab: am d400d03f: Merge "Fix issue #5595933: GREF leak due to race ↵Dianne Hackborn2011-11-111-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition in..." into ics-mr1 * commit '0b554bab585fe2d7eaaca8692106e0cbbc3aabe4': Fix issue #5595933: GREF leak due to race condition in...
| * | | | | | | | | | Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1Dianne Hackborn2011-11-111-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix issue #5595933: GREF leak due to race condition in...Dianne Hackborn2011-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...LoadedApk.ServiceDispatcher.connected , LoadedApk.forgetServiceDispatcher Don't be stupid if we receive a new binding to a ServiceConnection after it has already been unbound. Change-Id: I85a49de97372bf9af55542a89031f0b7a2ac8fbb
* | | | | | | | | | | | am 9acae658: am 847fbbea: Merge "Localized optimizations in views and ↵Christopher Tate2011-11-112-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmaps" into ics-mr1 * commit '9acae658e179796beee91d673f9f70af49ae3c9b': Localized optimizations in views and bitmaps
| * | | | | | | | | | | Merge "Localized optimizations in views and bitmaps" into ics-mr1Christopher Tate2011-11-112-6/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Localized optimizations in views and bitmapsChristopher Tate2011-11-112-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't call context.getResources() redundantly when unnecessary; similarly for Resources.getCompatibilityInfo() * During bitmap creation, don't bother clearing to 0: it's unnecessary because now that the raw bits are stored in a VM-side byte array, it was cleared at initialization time. Also, don't use the sanity- checking public entry point to erase to a color, because we know that we're by definition in a "legal" path to erase to the initial contents and don't need to incur the overhead of the (inappropriate) sanity checking. Change-Id: Idaca4d64fdecefd5d51337646ead32e1db510e02
* | | | | | | | | | | | | am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4780228fb2476304e29ddf9a118c460ac4eb96ee': Changes for access control.
| * | | | | | | | | | | | Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Changes for access control.Jeff Hamilton2011-11-114-32/+63
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package name is now required when using the NFC extras APIs so the context is stored away and used to derive the package name to be sent to the NfcService. Bug: 4515759 Change-Id: I1a3aba3fc026e0090a914b0686fc4b8dec25b927
* | | | | | | | | | | | | am 5a8ad071: am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device ↵Matthew Xie2011-11-114-25/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile for hfp and a2dp incoming connect" into ics-mr1 * commit '5a8ad0717dad332cab4b2d9f7a6030b76cb8d6bb': Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
| * | | | | | | | | | | | Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp ↵Matthew Xie2011-11-114-25/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incoming connect" into ics-mr1
| | * | | | | | | | | | | | Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connectMatthew Xie2011-11-114-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send CONNECT_OTHER_PROFILE to Device profile for low priority hfp and a2dp incoming connect. In the case when HFP autoconnect is off but a2dp autoconnect is on, if HF autoconnect to HFP, phone will reject HFP but connect a2dp. Before this fix, phone reject HFP. A2dp will not get connected unless the HF do media auto-connect, which most carkits do not do. Also do similar change for incoming a2dp connection bug 5091838 Change-Id: Ife1815f527bcd94e0d9ffc645028484fa9c49a43
* | | | | | | | | | | | | | am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-1110-34/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '405fcc87b247d91ce2b54623f351e91b740813c0': Notifiy callers when a speech synthesis error occurs.
| * | | | | | | | | | | | | Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-1110-34/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5589877 Change-Id: Ideca8966ea1caa6789b3273e388dd1f25c1e2758
* | | | | | | | | | | | | | Merge "Add more comments to the file header to explain the state diagram"Matthew Xie2011-11-111-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add more comments to the file header to explain the state diagramMatthew Xie2011-11-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The state diagram does not capture every messages. Here we explain the missing parts to make the diagram clearer. Change-Id: Ic5de5eb0556be4339d98023b0e7947d6e2cb30d1
* | | | | | | | | | | | | | | Merge "docs: some helpful javadocs for network info"Scott Main2011-11-112-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | docs: some helpful javadocs for network infoScott Main2011-10-062-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f1879bf10acd6371a76f11a8e5ec08643c3f943
* | | | | | | | | | | | | | | | Merge "Document our potentially suprising behavior on date ranges ending at ↵Jesse Wilson2011-11-111-68/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | midnight."
| * | | | | | | | | | | | | | | | Document our potentially suprising behavior on date ranges ending at midnight.Jesse Wilson2011-11-111-68/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=18512 Change-Id: I968ca1cfcef79273ee856624a640d56b038b96be