61870 Commits

Author SHA1 Message Date
Andreas Huber
5dd4c6bcb4 am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
2011-11-11 11:51:11 -08:00
Andreas Huber
ff0bd468d8 am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
  Disconnect on socket error on the RTSP control connection.
2011-11-11 11:51:09 -08:00
Narayan Kamath
e5fe1b302d am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs.
* commit '405fcc87b247d91ce2b54623f351e91b740813c0':
  Notifiy callers when a speech synthesis error occurs.
2011-11-11 11:51:07 -08:00
Andreas Huber
9a87a83802 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
2011-11-11 11:47:58 -08:00
Andreas Huber
9c981cd3d5 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.
2011-11-11 11:47:57 -08:00
Narayan Kamath
405fcc87b2 am 754c72ed: Notifiy callers when a speech synthesis error occurs.
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
  Notifiy callers when a speech synthesis error occurs.
2011-11-11 11:47:54 -08:00
Matthew Xie
99164b4209 Merge "Add more comments to the file header to explain the state diagram" 2011-11-11 11:20:43 -08:00
Matthew Xie
cef4cb20c3 Add more comments to the file header to explain the state diagram
The state diagram does not capture every messages. Here we explain
the missing parts to make the diagram clearer.

Change-Id: Ic5de5eb0556be4339d98023b0e7947d6e2cb30d1
2011-11-11 11:15:21 -08:00
Scott Main
8b4e2ccf15 Merge "docs: some helpful javadocs for network info" 2011-11-11 09:49:23 -08:00
Jesse Wilson
9f7ff11268 Merge "Document our potentially suprising behavior on date ranges ending at midnight." 2011-11-11 09:38:46 -08:00
Jesse Wilson
8d7fad5e67 Merge "Warn about changed behavior around '+' characters." 2011-11-11 08:22:33 -08:00
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
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
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
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
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
Adam Cohen
d562d300cd Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 2011-11-10 19:27: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