Steve Block
35b641d61c
Merge "Fixes WebView.loadData() to avoid constructing invalid URLs."
2011-06-09 10:16:29 -07:00
Narayan Kamath
4a615d67ea
Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes."
2011-06-09 10:13:47 -07:00
Xavier Ducrohet
4734541892
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
...
* changes:
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
2011-06-09 10:12:40 -07:00
Chet Haase
1bad9fc3ee
Merge "Change exception thrown when set() called on readonly Property."
2011-06-09 10:12:04 -07:00
Philip Milne
4839f5c3fe
Merge "Fix for baseline alignment in LinearLayout compatibiity mode."
2011-06-09 10:10:26 -07:00
Alex Sakhartchouk
ed0108b46b
Merge "More work to make libRS buildable on the host."
2011-06-09 09:42:28 -07:00
Xavier Ducrohet
29951e3d5e
am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
...
* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d':
Cherrypick d1ed33c4 from hc-mr1. do not merge.
2011-06-09 09:04:38 -07:00
Xavier Ducrohet
82dd50b3d6
am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
...
* commit 'e1d14a29ff9aa17923dc4e9406408cbc07a97c31':
Cherrypick 5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge dba35f1b from honeycomb-mr1. do not merge.
2011-06-09 09:04:26 -07:00
Romain Guy
e3f2baa793
am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
...
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
Disable plugins if setPluginsEnabled(false) called.
2011-06-09 09:03:55 -07:00
Martijn Coenen
b9a541465d
Merge "Added support for rediscovering a Tag (API)."
2011-06-09 08:01:25 -07:00
Andy McFadden
10a8840ac1
Merge "Add a URI for recurring event exceptions"
2011-06-09 07:37:07 -07:00
Narayan Kamath
5ae6175aab
Merge "Make changes to the TTS api suggested by the API review."
2011-06-09 04:09:22 -07:00
Steve Block
dfad404de4
Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()"
2011-06-09 03:48:41 -07:00
Chung-yih Wang
e4b581afe7
Merge "Add KeepAlive Interval Measurement."
2011-06-09 03:24:55 -07:00
Jake Hamby
1b32c3b473
resolved conflicts for merge of 7ca13deb to master
...
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
2011-06-08 23:20:09 -07:00
Dianne Hackborn
f2d3a5e5e5
am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '3aabdeaceff8405406d90c329a6691552559556d':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
dbd950b87a
am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
...
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
deb21d3eda
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
2011-06-08 22:33:34 -07:00
Dianne Hackborn
f179fe3910
am 2d618e41: am e22fe933: Fix issue #4582417 : Need to add new PackageManager...
...
* commit '2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
Fix issue #4582417 : Need to add new PackageManager...
2011-06-08 21:41:55 -07:00
Dianne Hackborn
c7269cbfa6
am e22fe933: Fix issue #4582417 : Need to add new PackageManager...
...
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
Fix issue #4582417 : Need to add new PackageManager...
2011-06-08 21:38:33 -07:00
John Wang
7771427ff5
am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
...
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
Set emergency call text visibility.
2011-06-08 20:41:41 -07:00
John Wang
e179704ece
Merge "Set emergency call text visibility." into honeycomb-LTE
2011-06-08 20:38:59 -07:00
Mathias Agopian
e1935e89aa
am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
...
* commit '17574b9a0a7cc1cf215935fce2474ca30d387046':
Fix a leak in RefBase (DO NOT MERGE)
2011-06-08 20:19:28 -07:00
Christopher Tate
a87feb9339
Merge "Fix handling of directory entries"
2011-06-08 20:13:57 -07:00
Christopher Tate
61334a3f83
Fix handling of directory entries
...
Don't emit tar blocks for directories with an invalid nonzero size. Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.
This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.
Change-Id: I625173f76df3c007e899209101ff2b587841f184
2011-06-08 20:11:49 -07:00
Dianne Hackborn
b0cc4a8083
am a1396dfe: am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:06:40 -07:00
Dianne Hackborn
2b6f1b12f7
am 02140891: Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
...
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -07:00
Dianne Hackborn
ab6bf752b3
Merge "Work on issue #4518815 : Compatibility mode introduces compatibility regression..." into honeycomb-mr2
2011-06-08 20:00:50 -07:00
Mathias Agopian
ef1e16fc0b
am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
...
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
Fix a leak in RefBase (DO NOT MERGE)
2011-06-08 19:56:06 -07:00
Daisuke Miyakawa
84ff6400ce
Merge "Introduces new Contacts API for ranking promotion."
2011-06-08 19:55:47 -07:00
Svetoslav Ganov
b68767833e
Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly."
2011-06-08 19:44:20 -07:00
John Wang
a89933c191
am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
...
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
Fix layout issue on Xoom when device thinks there's a SIM.
2011-06-08 19:41:39 -07:00
John Wang
7f0d352506
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
2011-06-08 19:37:56 -07:00
Mathias Agopian
c2db91c3bf
am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
...
* commit 'b40e85f90146a654bfe5657187be491147814ea0':
Fix a leak in RefBase
2011-06-08 19:34:30 -07:00
Mathias Agopian
58d6631e4d
am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
...
* commit '645434fb4eff408698423d70904fb8fc709a5225':
Fix a leak in RefBase
2011-06-08 19:30:47 -07:00
Mathias Agopian
ee8e9af975
Merge "Fix a leak in RefBase" into honeycomb-mr2
2011-06-08 19:28:39 -07:00
Dianne Hackborn
acf87675ae
Work on issue #4518815 : Compatibility mode introduces compatibility regression...
...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
John Reck
93b5cfad3a
Merge "Fix initial zoom with loadViewState"
2011-06-08 18:19:12 -07:00
Mathias Agopian
ece602de8d
am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
...
* commit 'c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
2011-06-08 17:32:30 -07:00
Irfan Sheriff
ad381c3834
am 92593dc4: am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE
...
* commit '92593dc49b348c4951037a1ae2fa17bb6644ffb9':
Clear IP configuration on lost network
2011-06-08 17:31:58 -07:00
Adam Powell
903f4a0cf3
am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
...
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
Public styles for action bar tabs
2011-06-08 17:16:16 -07:00
Andreas Huber
aead99ac3d
am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
...
* commit '752a5b3df55da655792d382025171d94073e05f9':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
2011-06-08 17:03:17 -07:00
Martijn Coenen
fe0143ce63
am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
...
* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
Prevent allocation overflows by corrupt NDEF records.
2011-06-08 17:03:05 -07:00
Adam Powell
58ac3ee602
am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
...
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
Public styles for action bar tabs
2011-06-08 16:58:35 -07:00
Adam Powell
59fd67e54b
Merge "Public styles for action bar tabs" into honeycomb-mr2
2011-06-08 16:54:50 -07:00
Mathias Agopian
3b0a7a739e
Fix a leak in RefBase
...
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Id85e749ba04521199555dd701198edd097c313d4
2011-06-08 16:25:01 -07:00
Mathias Agopian
9a03cecf8b
Fix a leak in RefBase (DO NOT MERGE)
...
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
2011-06-08 16:13:39 -07:00
Romain Guy
71f9080c11
Merge "Remove obsolete code."
2011-06-08 16:10:33 -07:00
Andreas Huber
7927f90b23
Merge "This device-specific workaround is no longer necessary."
2011-06-08 15:49:34 -07:00
Wink Saville
3e302e0487
am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
...
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
Report data status from ApnContext even if data is detached
2011-06-08 15:03:43 -07:00