Jesse Wilson
41e0839b13
Warn about changed behavior around '+' characters.
...
Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: I086c2c8433f05185a1496e2662734d239d8cbb74
2011-11-11 11:16:17 -05:00
Kristian Monsen
a3c157eef0
Removing the ability to get native instrumentation as part of nav dump
...
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
2011-11-11 16:11:36 +00:00
Jesse Wilson
99a64f4b1d
Document our potentially suprising behavior on date ranges ending at midnight.
...
Bug: http://code.google.com/p/android/issues/detail?id=18512
Change-Id: I968ca1cfcef79273ee856624a640d56b038b96be
2011-11-11 11:03:21 -05:00
Andreas Huber
cd556b82fd
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
2011-11-11 07:39:25 -08:00
Andreas Huber
5d42075e45
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
2011-11-11 07:39:18 -08:00
Andreas Huber
d9f25bc941
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
2011-11-11 07:39:11 -08:00
James Dong
f4c3cc06cb
am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
...
* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
Add support for retrieving location information in mp4/3gpp files
2011-11-11 15:34:21 +00:00
Akwasi Boateng
1333742bed
am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
...
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
Make the overridden ImageView#setVisibility remotable
Clamp non-monotonic stats instead of dropping.
DO NOT MERGE. Fix leak in LayoutTransition
Fix lastVisible/global rects
Fix Wimax-less build.
Fix leak in LayoutTransition
Deferring wallpaper update to improve workspace scrolling (issue 5506959)
Terminate EGL when an app goes in the background
boot animation is dithered and scaled
Fix NdefRecord byte-stream constructor.
PopupWindow dismiss() can get into a recursive loop.
Fold WiMAX state into the mobile RSSI.
Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00:00
Jamie Gennis
0ed4c7f8cc
am 0c71e5ed: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit '0c71e5ed820350a4ae0517dc73d1f46cd3534b55':
SystemUI: Disable HW acceleration for status bar
2011-11-11 15:34:19 +00:00
Glenn Kasten
62b9aec7a0
Don't check return value of new for being == null
...
new either succeeds or throws an exception
Change-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff
2011-11-11 07:30:19 -08:00
James Dong
510180f162
am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
...
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
2011-11-11 15:28:32 +00:00
Akwasi Boateng
cb0db0306b
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
2011-11-11 15:20:20 +00:00
Svetoslav Ganov
2b51019220
am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
...
* commit 'd00e75e94d1aa5cee740a06a4ce760e49016f7f6':
PopupWindow dismiss() can get into a recursive loop.
2011-11-11 15:12:58 +00:00
Chet Haase
025e948d77
am ab51626f: am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
...
* commit 'ab51626f22259e27ef376cbbc1d127524a57459d':
DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 15:12:56 +00:00
Jamie Gennis
1dd80cf4d4
am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
SystemUI: Disable HW acceleration for status bar
2011-11-11 15:12:55 +00:00
Jeff Sharkey
0a63214f39
am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
...
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
Clamp non-monotonic stats instead of dropping.
2011-11-11 15:12:51 +00:00
Daniel Sandler
b291fa96e3
am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
...
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
Fold WiMAX state into the mobile RSSI.
2011-11-11 15:12:49 +00:00
Daniel Sandler
8c2ef85cce
am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
...
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:12:48 +00:00
Adam Powell
fcba1b60a8
am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
...
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
Make the overridden ImageView#setVisibility remotable
2011-11-11 15:12:46 +00:00
Adam Cohen
33be88cba8
am d562d300: Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1
...
* commit 'd562d300cde63ae023f09fc3c7ded0988dead5d1':
Deferring wallpaper update to improve workspace scrolling (issue 5506959)
2011-11-11 15:12:45 +00:00
John Reck
204a828599
am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1
...
* commit '9490fe4095171b9af380812b895101f8142d3cd5':
Fix lastVisible/global rects
2011-11-11 15:12:41 +00:00
Martijn Coenen
059977594f
am 99898de9: Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
...
* commit '99898de902c36687be126b33ee8a4858d26871ac':
Fix NdefRecord byte-stream constructor.
2011-11-11 15:12:36 +00:00
Chet Haase
56a4748111
am 692fda9d: Merge "Fix leak in LayoutTransition" into ics-mr1
...
* commit '692fda9da31e2a25fd295140ec0d8b6cd0a934ee':
Fix leak in LayoutTransition
2011-11-11 15:12:35 +00:00
Robert Greenwalt
8d55a24276
am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1
...
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
Fix Wimax-less build.
2011-11-11 15:12:33 +00:00
Romain Guy
048b69907f
am 50a66f0e: Merge "Terminate EGL when an app goes in the background" into ics-mr1
...
* commit '50a66f0e9c5a85a6af4a99eb66656a69eba24572':
Terminate EGL when an app goes in the background
2011-11-11 15:12:31 +00:00
Mathias Agopian
350e437f8c
am de62d9cb: Merge "boot animation is dithered and scaled" into ics-mr1
...
* commit 'de62d9cbe00d0fcac24af9a3d89ba7a125e56eaa':
boot animation is dithered and scaled
2011-11-11 15:12:28 +00:00
Jamie Gennis
0c71e5ed82
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 14:46:21 +00:00
Narayan Kamath
754c72ed9e
Notifiy callers when a speech synthesis error occurs.
...
bug:5589877
Change-Id: Ideca8966ea1caa6789b3273e388dd1f25c1e2758
2011-11-11 14:21:43 +00:00
James Dong
00aa51b355
Unhide the key to retriever location information in 3gp/mp4 files
...
Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug: 5560253
2011-11-11 01:49:01 -08:00
James Dong
08e42967b9
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
2011-11-11 01:44:06 -08:00
Svetoslav Ganov
d00e75e94d
am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
...
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
PopupWindow dismiss() can get into a recursive loop.
2011-11-11 08:02:27 +00:00
Chet Haase
ab51626f22
am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
...
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 08:02:27 +00:00
Jamie Gennis
787e2c276a
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 08:02:26 +00:00
Svetoslav Ganov
7b8bec280f
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
2011-11-11 00:00:02 -08:00
Jeff Sharkey
51c00a57f4
Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
2011-11-10 20:31:03 -08:00
Daniel Sandler
992e77af11
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
2011-11-10 20:16:47 -08:00
Daniel Sandler
8b50bd8c9b
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
2011-11-10 20:16:38 -08:00
Adam Powell
0ddcad0b4e
Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
2011-11-10 19:56:03 -08:00
Adam Powell
b241b4c6ab
Make the overridden ImageView#setVisibility remotable
...
Change-Id: Idaf061ea8c2a06ec8abaf74cf865446d9092afa2
2011-11-10 19:48:23 -08:00
Dianne Hackborn
4eff8d37da
Fix issue #5522658 : Menu button shown on lock screen if app underneath requests it
...
Drive the menu button off of the currently focused window. That is, after all,
the one that is going to receive the menu key event.
Change-Id: I61cac1e274602e5ea53402ab15bd63a9cd89e9cd
2011-11-10 19:38:40 -08:00
Adam Cohen
d562d300cd
Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1
2011-11-10 19:27:58 -08:00
Romain Guy
da96f8ac2c
Discard framebuffer rendering queues when discarding layers
...
Bug #5581817
Change-Id: If612846ec5f7793710fc4df152791fb32c506551
2011-11-10 19:23:58 -08:00
John Reck
9490fe4095
Merge "Fix lastVisible/global rects" into ics-mr1
2011-11-10 17:58:27 -08:00
Jeff Sharkey
d4ef8c8fc9
Clamp non-monotonic stats instead of dropping.
...
When encountering non-monotonic stats rows, recover remaining data by
clamping to 0. In particular, this avoids edge-case where persisting
threshold checks would never trigger. Also recover when tethering
snapshots are missing.
Bug: 5600785, 5433871, 5600678
Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
2011-11-10 17:54:23 -08:00
Chet Haase
30f03ac650
DO NOT MERGE. Fix leak in LayoutTransition
...
LayoutTransition was making an incorrect assumption that there could
only be one transition animation on a child of a transitioning container.
But if multiple children are added/removed to/from that container, there would
be multiple calls to set up changing animations for each existing child
of that container. This meant that the child would have multiple, new
OnLayoutChangeListeners added to it as part of the setup process.
Meanwhile, we would cache only the latest listener in a hashmap that used
the child as a key for the listener. Then when we cleaned up the hashmap later,
we would remove only the latest listener from the child, leaving the rest there
for eternity.
The fix is to skip the setup entirely for children that already have listeners
set on them; they must, if that's the case, already have been set up and are
already listening for layout changes. Setting up the animation is redundant,
and adding another listener is a leak.
issue #5588509 : memory leak in systemui
Change-Id: Ie2192593d84702be7243c18760dfdb3a027b761c
2011-11-10 17:53:31 -08:00
Martijn Coenen
99898de902
Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
2011-11-10 17:40:20 -08:00
Chet Haase
692fda9da3
Merge "Fix leak in LayoutTransition" into ics-mr1
2011-11-10 17:33:31 -08:00
John Reck
9f9fac0ad2
Fix lastVisible/global rects
...
Bug: 5601629
References tend to always be equal to the things they are referencing,
use copies instead.
Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
2011-11-10 17:33:24 -08:00
Robert Greenwalt
7c9f8005e2
Merge "Fix Wimax-less build." into ics-mr1
2011-11-10 17:22:14 -08:00
Robert Greenwalt
6537b02875
Fix Wimax-less build.
...
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.
bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54
2011-11-10 17:14:05 -08:00