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
Wink Saville
90034e8cad
am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE
...
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
Use CSIM to get provision information
2011-06-08 15:03:35 -07:00
Wink Saville
267850eedd
Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
2011-06-08 15:00:46 -07:00
Wink Saville
f29d2e41af
Merge "Use CSIM to get provision information" into honeycomb-LTE
2011-06-08 14:58:53 -07:00
John Wang
f4e97bbd86
am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
...
* commit '1f8665895f71904b9d757854277cb637841356c3':
Add SIM PUK unlockscreen.
2011-06-08 14:46:04 -07:00
Chia-chi Yeh
f08f5e33c8
Merge "The UI part of the user space VPN support."
2011-06-08 14:17:44 -07:00
Jean-Baptiste Queru
01b5df912a
am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
...
* commit '0315a2c5640dc91cd1689db9dff997e43e4effca':
Tweak setViewport stuff for fwd-compat
2011-06-08 14:14:56 -07:00
Jean-Baptiste Queru
233fca912a
am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
...
* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
Tweak setViewport stuff for fwd-compat
2011-06-08 14:07:19 -07:00
John Wang
d8c83052bc
am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
...
* commit 'fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
Do not merge. Return null id for Non-phone device.
2011-06-08 14:04:37 -07:00
Jeff Brown
6255c3aa91
am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
...
* commit '5f0b1721eece5ca614044cda638f11fbec0eab0a':
Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 14:04:33 -07:00
John Wang
4a7ccb16b9
am cea03df2: Do not merge. Return null id for Non-phone device.
...
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
Do not merge. Return null id for Non-phone device.
2011-06-08 13:52:26 -07:00
Jeff Brown
4e330146a3
am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
...
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 13:52:22 -07:00
Nick Pelly
271272ada9
Merge "Move NDEF URI helper method into android.nfc.NfcRecord"
2011-06-08 13:44:28 -07:00
Jean-Baptiste Queru
16b844695c
Merge "Tweak setViewport stuff for fwd-compat"
2011-06-08 13:10:58 -07:00
Wink Saville
29c78fdea1
am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
...
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
Fix default preferred network.
2011-06-08 12:59:37 -07:00
Wink Saville
48f6f541da
Merge "Fix default preferred network." into honeycomb-LTE
2011-06-08 12:56:27 -07:00
Chet Haase
dfcb117f1d
Merge "Add 'Property' object"
2011-06-08 12:51:06 -07:00
Martijn Coenen
b40e2b149a
Merge "Implement Felica timeout handling (API)."
2011-06-08 11:04:36 -07:00
Robert Greenwalt
6ff5e1dc70
Merge "resolved conflicts for merge of e139167c to master"
2011-06-08 10:29:13 -07:00
Robert Greenwalt
77a7e79738
resolved conflicts for merge of e139167c to master
...
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
2011-06-08 10:01:06 -07:00
Mike Lockwood
c9fb9f7fd7
Merge "MTP: Remove obsolete setPtpMode support"
2011-06-08 09:43:02 -07:00
Mike Lockwood
77998bc005
Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"
2011-06-08 09:42:54 -07:00
Eino-Ville Talvala
37b4e42896
Merge "Updates to Camera API documentation."
2011-06-08 09:18:37 -07:00
Steve Block
8e46ddadef
Merge "Merge WebKit at r82507: Update useragent string"
2011-06-08 08:26:13 -07:00
satok
9a8e93a831
Merge "Fix the display name of InputMethodSubtype"
2011-06-08 04:09:21 -07:00
Narayan Kamath
b09ed564b7
Merge "Fix the threading behaviour of TTS audio requests."
2011-06-08 02:11:26 -07:00
Svetoslav Ganov
1810eb7e86
Merge "Crash in the TouchExplorer"
2011-06-07 19:29:20 -07:00
Jesse Wilson
737e8087dc
Merge "Use external/mockwebserver in frameworks/base"
2011-06-07 18:49:32 -07:00
Chia-chi Yeh
591141089b
Merge "Do not register the callbacks in the constructor."
2011-06-07 18:18:56 -07:00
Adam Powell
45942d332e
resolved conflicts for merge of a7d01a75 to master
...
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
2011-06-07 18:16:00 -07:00
Wink Saville
83d846cc99
am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
...
* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
Preferred network discrepancy after rild is restarted.
2011-06-07 17:54:25 -07:00
Robert Greenwalt
ff984f927a
am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
...
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
Fix NPE in the statusbar.
2011-06-07 17:54:17 -07:00
Jaikumar Ganesh
309ee97168
am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
...
* commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
Remove discoverable timeout handler. DO NOT MERGE
2011-06-07 17:53:41 -07:00
Jeff Brown
3b462032b0
am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
...
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
Fix build.
2011-06-07 17:52:53 -07:00
Jeff Brown
5d99f17e82
am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
...
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
Revert velocity damping. Bug: 4364920
2011-06-07 17:52:30 -07:00