Andreas Huber
edbf4b3b21
am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 19:06:43 -08:00
Jim Miller
3c70c3bad1
am eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit 'eaa738efac8cb34d57ca6c0aea4c95586b0d9fd4':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 19:06:30 -08:00
Stephen Hines
39530e77e5
Actually fix build.
...
Change-Id: I43cb042b0b8c8ac0f2e5fd9aee823298f9c29820
2011-01-26 18:07:47 -08:00
Andreas Huber
bba92023e5
am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 15:52:48 -08:00
Stephen Hines
7c4a66be94
Fix build breakage.
...
Change-Id: I3fc80c719e7bfa2940af9257f46694232c0162a3
2011-01-26 15:51:29 -08:00
Jim Miller
eaa738efac
am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit '85433c76066843d20c92c90d64e842e4f14dbac8':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 15:50:41 -08:00
Andreas Huber
63b38e31aa
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
2011-01-26 15:50:04 -08:00
Jim Miller
85433c7606
Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
2011-01-26 15:47:40 -08:00
Romain Guy
c02a1cc1b1
am 62bea428: am 9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
...
* commit '62bea4287dafc88b640d7e3fc8a433ddd858a5b8':
Optimize invalidate() calls.
2011-01-26 15:46:21 -08:00
Fabrice Di Meglio
036dfd0653
am 3782fe2b: am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
...
* commit '3782fe2b23c4a6fa2e512f1d200ffa85c37bfb14':
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
2011-01-26 15:46:17 -08:00
Romain Guy
62bea4287d
am 9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
...
* commit '9e7c2c6ded1144122915cfb8bd663e789c7eb93b':
Optimize invalidate() calls.
2011-01-26 15:43:09 -08:00
Fabrice Di Meglio
3782fe2b23
am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
...
* commit 'f728411ba40d71a40a0cb0dbfcaa44764af17692':
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
2011-01-26 15:42:55 -08:00
Andreas Huber
0f535afd7e
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
And now we're just ignoring them. Yay standards.
Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
2011-01-26 15:40:56 -08:00
Romain Guy
9e7c2c6ded
Merge "Optimize invalidate() calls." into honeycomb
2011-01-26 15:40:16 -08:00
Romain Guy
0fd89bf722
Optimize invalidate() calls.
...
Change-Id: I09d99290ca74f96046702bc2604f125a1276ce05
2011-01-26 15:41:30 -08:00
Jim Miller
f1e22e5c78
Fix 3354590: Add back button to dismiss RecentAppsPanel
...
Change-Id: I65337e8ebf823e7a92f810cd670b23edf8e70067
2011-01-26 15:39:51 -08:00
Fabrice Di Meglio
f728411ba4
Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
2011-01-26 15:39:24 -08:00
Jason Chen
330e298ddd
am bb03e3b7: am b61440b4: Merge "Cherry-pick of f5e4f208b9 to honeycomb" into honeycomb
...
* commit 'bb03e3b779ec2f5abfd8e07bf92001b229becc0f':
Cherry-pick of f5e4f208b9 to honeycomb
2011-01-26 15:36:25 -08:00
Fabrice Di Meglio
dc2dd88249
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
...
- add human readable error messages
Change-Id: Ib6937684e61aca80b2c3bc78fd67b93c3df61d17
2011-01-26 15:35:47 -08:00
Jason Chen
bb03e3b779
am b61440b4: Merge "Cherry-pick of f5e4f208b9 to honeycomb" into honeycomb
...
* commit 'b61440b440ab6cd89ea1462121302f0c4896a109':
Cherry-pick of f5e4f208b9 to honeycomb
2011-01-26 15:34:18 -08:00
Mike Lockwood
82cb6731a0
am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:34:15 -08:00
Mike Lockwood
bd65c065b2
am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:32:11 -08:00
Jason Chen
b61440b440
Merge "Cherry-pick of f5e4f208b9 to honeycomb" into honeycomb
2011-01-26 15:30:56 -08:00
Mike Lockwood
a13732e17a
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
2011-01-26 15:30:07 -08:00
Mike Lockwood
2107d23fc9
MTP: Fix month off by one error in date parsing and formatting code
...
BUG: 3379100
Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-01-26 15:11:48 -08:00
Shih-wei Liao
88523f3757
am dde78c2b: am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit 'dde78c2b1c2c2ea28b6799ac135477386ae5df93':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 15:00:44 -08:00
Shih-wei Liao
dde78c2b1c
am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit '79204b98d260d8f5e8419f5149b31b336424aec5':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 14:58:57 -08:00
Shih-wei Liao
79204b98d2
Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
2011-01-26 14:56:41 -08:00
John Wang
890932eccb
am 9c90f6d9: am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '9c90f6d9fdaf128bbe07d4aca35ed08c5326b7c5':
Enable recovery in RIL wakelock release check.
2011-01-26 14:52:10 -08:00
James Dong
804d8798d5
am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:49:23 -08:00
John Wang
9c90f6d9fd
am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '7b4ba9d80d2cdde310c29d01d0e22c7815d84261':
Enable recovery in RIL wakelock release check.
2011-01-26 14:48:34 -08:00
Shih-wei Liao
f5a16efcc3
Part II of fixing b/2943524: On-device linking rs_core.
...
Change-Id: I1db1f8a2c9e8afabd9961c0effca60b10c9ed4dc
2011-01-26 14:47:17 -08:00
James Dong
8bea1d5585
am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:45:41 -08:00
John Wang
7b4ba9d80d
Merge "Enable recovery in RIL wakelock release check." into honeycomb
2011-01-26 14:45:24 -08:00
James Dong
7fb232c40c
Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
2011-01-26 14:43:59 -08:00
Svetoslav Ganov
2d65afb7c4
am 54fc7807: am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit '54fc78072fec46933ca5ee96c7642bd4b9fc540f':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:43:18 -08:00
Svetoslav Ganov
54fc78072f
am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit 'df4672643b92208b4ab7f9ab995dca8b69d3c458':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:41:33 -08:00
John Wang
4376538c47
Enable recovery in RIL wakelock release check.
...
This is a cherry-pick Change 91968 from GB branch.
Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.
and
2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.
Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.
bug: 3369427, 3370827
Change-Id: Ibbcc95d67a292ffe20339ea9bdb0f2e4a4988da0
2011-01-26 14:40:36 -08:00
Svetoslav Ganov
df4672643b
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
2011-01-26 14:39:47 -08:00
Dianne Hackborn
3a40182c77
am 49295e53: am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '49295e5379472c22af8975e32271f9659c016531':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:17:37 -08:00
Robert Greenwalt
61940a937f
Merge "Get rid of manual int->ipv4 string generation"
2011-01-26 14:16:42 -08:00
Jean-Michel Trivi
d83e548dd4
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:15:15 -08:00
Dianne Hackborn
49295e5379
am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit 'ccd79399cc2a28d79287fd1558c5f5a530356003':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:15:08 -08:00
Stephen Hines
6b193fed09
am 203107d4: am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '203107d4901704c33eca2e5f7e5cd967fd372bbe':
Hook up tgammaf properly for RS.
2011-01-26 14:13:06 -08:00
Jean-Michel Trivi
b8efdf7f80
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:12:45 -08:00
Stephen Hines
203107d490
am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
2011-01-26 14:10:58 -08:00
Dianne Hackborn
3a985aed11
Cherry-pick of f5e4f208b9 to honeycomb
...
Original change description:
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:09:45 -08:00
Stephen Hines
8fc7690f2b
Merge "Hook up tgammaf properly for RS." into honeycomb
2011-01-26 14:08:49 -08:00
Dianne Hackborn
ccd79399cc
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Jean-Michel Trivi
1155efdc71
am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00