Dianne Hackborn
|
0ac3e01aaf
|
am be70785f: Make activity manager more robust in the face of app activity leaks.
* commit 'be70785f9b2dbd2c52fd8676d99bc64b22784201':
Make activity manager more robust in the face of app activity leaks.
|
2011-11-11 16:13:46 -08:00 |
|
Robert Greenwalt
|
6cfc95481e
|
am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
Tone down Tethering logs.
|
2011-11-11 14:38:34 -08:00 |
|
Robert Greenwalt
|
8e86aeceb3
|
Merge "Tone down Tethering logs." into ics-mr1
|
2011-11-11 14:37:18 -08:00 |
|
Dianne Hackborn
|
ac284f3ef4
|
am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
* commit 'd400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
Fix issue #5595933: GREF leak due to race condition in...
|
2011-11-11 14:26:30 -08:00 |
|
Christopher Tate
|
fbefa6643a
|
am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
Localized optimizations in views and bitmaps
|
2011-11-11 14:26:28 -08:00 |
|
Dianne Hackborn
|
b68fde0806
|
Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
|
2011-11-11 14:24:58 -08:00 |
|
Christopher Tate
|
f01724f46a
|
Merge "Localized optimizations in views and bitmaps" into ics-mr1
|
2011-11-11 14:24:53 -08:00 |
|
Nick Pelly
|
53bdc55273
|
am 48b651cb: Merge "Changes for access control." into ics-mr1
* commit '48b651cb2a3afab979c2a46185fd7edfa5424387':
Changes for access control.
|
2011-11-11 13:08:37 -08:00 |
|
Nick Pelly
|
cce3281f62
|
Merge "Changes for access control." into ics-mr1
|
2011-11-11 13:06:44 -08:00 |
|
Matthew Xie
|
e4338c8ad2
|
am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit 'a303f0ecfc5472d3b2e65cb7de9f7413a9a83d9a':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
|
2011-11-11 12:18:22 -08:00 |
|
Matthew Xie
|
aa3a932ce8
|
Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
|
2011-11-11 12:16:41 -08:00 |
|
Peter Ng
|
a193902173
|
am 20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
Making the quicksettings notifications icon the right opacity
|
2011-11-11 11:59:40 -08:00 |
|
Peter Ng
|
aabb10eb68
|
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
|
2011-11-11 11:57:41 -08:00 |
|
Dianne Hackborn
|
dc0606b5d1
|
am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit 'be425ccea47c13d3f8f3d877fdbdcb3c074f7e8b':
Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
|
2011-11-11 11:48:33 -08:00 |
|
James Dong
|
32ec7224b0
|
am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
Unhide the key to retriever location information in 3gp/mp4 files
|
2011-11-11 11:48:27 -08:00 |
|
Andreas Huber
|
86a7311ab6
|
am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
|
2011-11-11 11:48:16 -08:00 |
|
Robert Greenwalt
|
4eb211e21b
|
am 424781e2: Fix NPE in ConnectivityService.
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
Fix NPE in ConnectivityService.
|
2011-11-11 11:48:11 -08:00 |
|
Eric Laurent
|
86167c8032
|
am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
|
2011-11-11 11:48:05 -08:00 |
|
Andreas Huber
|
a3d4049fcb
|
am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
Instead of asserting, signal a runtime error if the session doesn't contain
|
2011-11-11 11:48:00 -08:00 |
|
Andreas Huber
|
2d4a178249
|
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
|
9ba00d8284
|
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
|
8063f8b346
|
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 |
|
Dianne Hackborn
|
b7afe325b4
|
Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
|
2011-11-11 11:36:14 -08:00 |
|
James Dong
|
f6de140cb9
|
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
|
2011-11-11 10:49:24 -08:00 |
|
Andreas Huber
|
bd667dd719
|
Merge "Didn't mean to check this in..." into ics-mr1
|
2011-11-11 10:46:02 -08:00 |
|
Eric Laurent
|
3c1afaaf79
|
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
|
2011-11-11 08:17:22 -08:00 |
|
Andreas Huber
|
849c30071d
|
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
|
2373ecfc11
|
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
|
6d7a5bddb1
|
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
|
2011-11-11 07:39:11 -08:00 |
|
James Dong
|
e23eb3e23f
|
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
|
19353c4193
|
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
|
5965359aef
|
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
|
b8ed17f5f1
|
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
|
509ec438cf
|
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
|
6a025c40de
|
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
|
d9887d464d
|
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
|
f150b45d11
|
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
|
d43a2ef564
|
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
|
9e9ac8c334
|
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
|
571668ac49
|
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
|
86f9d8af31
|
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
|
7ea9cec879
|
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
|
bd6f283b2a
|
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
|
07432365ce
|
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
|
87e69f0aba
|
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
|
ad9bb6df07
|
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 |
|
James Dong
|
714fb46074
|
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
|
2011-11-11 01:44:06 -08:00 |
|
Svetoslav Ganov
|
aefd78ef93
|
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
|
131f20c4cf
|
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
|
255d499dec
|
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 |
|