Adam Cohen
c446ae83e0
Merge "Removing deprecated widget api method." into honeycomb
2011-01-19 11:47:56 -08:00
Winson Chung
0fd9be2118
Removing deprecated widget api method.
...
Change-Id: I0610dcb5cf1001b2b7e86d78a88addf174cedd77
2011-01-19 11:44:25 -08:00
Irfan Sheriff
e623ae47e0
am 6387174c: am 7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
...
* commit '6387174c41cb97f82106be9922a619ab1324980a':
Fix soft Ap handling on system restart
2011-01-19 11:44:22 -08:00
James Dong
581cad2221
Turn error/exception logging on at the native layer
...
o also fixed some compilation warnings
Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
2011-01-19 11:42:53 -08:00
Irfan Sheriff
6387174c41
am 7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
...
* commit '7a97ad421b50208dc2f484cc23fa3bb29331a713':
Fix soft Ap handling on system restart
2011-01-19 11:42:35 -08:00
Irfan Sheriff
7a97ad421b
Merge "Fix soft Ap handling on system restart" into honeycomb
2011-01-19 11:40:01 -08:00
Romain Guy
78cda1670d
am 4ca3ee26: am c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
...
* commit '4ca3ee261d71ba56a9636655c27d6d038392b746':
Don't let toasts "leak" Context instances.
2011-01-19 11:38:52 -08:00
Romain Guy
4ca3ee261d
am c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
...
* commit 'c7816cd6a1441cd46af57224c616c2d56ced5105':
Don't let toasts "leak" Context instances.
2011-01-19 11:36:10 -08:00
Andreas Huber
4ad6fed5cd
am ee48eaba: am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
...
* commit 'ee48eabab8c32104eb04e2abb6f6212b94f32211':
Return a runtime error if decryption fails instead of asserting.
2011-01-19 11:35:38 -08:00
Andreas Huber
ee48eabab8
am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
...
* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
Return a runtime error if decryption fails instead of asserting.
2011-01-19 11:33:56 -08:00
Romain Guy
c7816cd6a1
Merge "Don't let toasts "leak" Context instances." into honeycomb
2011-01-19 11:33:43 -08:00
Andreas Huber
71bb6a2a3e
Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
2011-01-19 11:31:44 -08:00
Andreas Huber
283e031d11
Always revert to the previous bandwidth if the required sequence number cannot be found
...
Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
2011-01-19 11:30:43 -08:00
Andreas Huber
0cf2616fac
Return a runtime error if decryption fails instead of asserting.
...
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
2011-01-19 11:24:39 -08:00
Dianne Hackborn
d00c6c63b5
am 92ce4f6a: am 7666ebd9: Merge "Bee seeing you..." into honeycomb
...
* commit '92ce4f6afcfce9db08c8c8468bc732eeab3cd7c2':
Bee seeing you...
2011-01-19 11:20:01 -08:00
Dianne Hackborn
92ce4f6afc
am 7666ebd9: Merge "Bee seeing you..." into honeycomb
...
* commit '7666ebd9f29df718f57354e0317db2ccbe6369b0':
Bee seeing you...
2011-01-19 11:18:12 -08:00
Dianne Hackborn
7666ebd9f2
Merge "Bee seeing you..." into honeycomb
2011-01-19 11:16:38 -08:00
Romain Guy
c4d09f2b69
Don't let toasts "leak" Context instances.
...
Change-Id: I05a936579e60360cdb3453ad5cbcead8ca03191a
2011-01-19 10:55:19 -08:00
Mike Lockwood
ee8d313985
am da3bb70a: am 54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
...
* commit 'da3bb70a1f9240766d60bffa039d26e6378f2a6c':
Environment.isExternalStorageRemovable() is false if external storage is emulated
2011-01-19 10:44:32 -08:00
Mike Lockwood
da3bb70a1f
am 54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
...
* commit '54973710d769e4722dc21778f8fcb7b08d2872dd':
Environment.isExternalStorageRemovable() is false if external storage is emulated
2011-01-19 10:42:31 -08:00
Andreas Huber
4ef9ac9fc8
am 8da1ca52: am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
...
* commit '8da1ca52808f81f41919e118c3667b794ee31f6b':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
2011-01-19 10:42:15 -08:00
Mike Lockwood
54973710d7
Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
2011-01-19 10:40:56 -08:00
Andreas Huber
8da1ca5280
am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
...
* commit '069ee21a2012e0b6fd355253ea81a84ea11138d2':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
2011-01-19 10:40:19 -08:00
Romain Guy
611cb600ee
am 9941311a: am 49903d26: Merge "Fix 9patches in Launcher" into honeycomb
...
* commit '9941311a5be06b82f6a5de21695dbae0b0c979f0':
Fix 9patches in Launcher
2011-01-19 10:40:09 -08:00
Andreas Huber
069ee21a20
Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
2011-01-19 10:38:16 -08:00
Romain Guy
9941311a5b
am 49903d26: Merge "Fix 9patches in Launcher" into honeycomb
...
* commit '49903d265be787885619e017edcc42604005f6b0':
Fix 9patches in Launcher
2011-01-19 10:38:15 -08:00
Romain Guy
fdbec3e482
Fix 9patches in Launcher
...
Change-Id: Ieedf36ccaab253909b44ed8c222d523867f095be
2011-01-19 10:37:35 -08:00
Romain Guy
49903d265b
Merge "Fix 9patches in Launcher" into honeycomb
2011-01-19 10:35:46 -08:00
Andreas Huber
d95b46a1d1
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
...
Refactor the logic a little.
Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
2011-01-19 10:34:52 -08:00
James Dong
b61296c763
am 6df89f2e: am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
...
* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
Expose average video frame rate via MPEG4Extractor
2011-01-19 10:32:58 -08:00
James Dong
6df89f2efc
am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
...
* commit '8e7d626385eef104d52aa9080b70395ca840a0cd':
Expose average video frame rate via MPEG4Extractor
2011-01-19 10:31:06 -08:00
James Dong
8e7d626385
Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
2011-01-19 10:29:04 -08:00
Leon Scroggins
a09fddc555
am 60964579: am b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
...
* commit '60964579fe9c56bfac21a91dbb2355b1086e47b6':
Only scroll on screen when necessary.
2011-01-19 10:28:32 -08:00
Mike Lockwood
1dc638e316
am 216a7b97: am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
...
* commit '216a7b97ebedc6886d98a117fcfe0b83891e5e45':
MTP: Close and reopen driver file after an error.
2011-01-19 10:26:30 -08:00
Leon Scroggins
60964579fe
am b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
...
* commit 'b90bd293c2a8f2bb68f5cbd63966ea1739814e7d':
Only scroll on screen when necessary.
2011-01-19 10:25:52 -08:00
Leon Scroggins
b90bd293c2
Merge "Only scroll on screen when necessary." into honeycomb
2011-01-19 10:23:52 -08:00
Mike Lockwood
216a7b97eb
am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
...
* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
MTP: Close and reopen driver file after an error.
2011-01-19 10:23:44 -08:00
James Dong
cbb488d678
Expose average video frame rate via MPEG4Extractor
...
bug - 3362483
Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
2011-01-19 10:20:59 -08:00
Mike Lockwood
dc80b7ec05
Merge "MTP: Close and reopen driver file after an error." into honeycomb
2011-01-19 10:20:38 -08:00
Mike Lockwood
70ee3ca616
Environment.isExternalStorageRemovable() is false if external storage is emulated
...
Change-Id: Ib1afe83e4295d8304b65e822edd0dfa1591a5be7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:19:12 -08:00
Leon Scroggins
3be1ffab08
Only scroll on screen when necessary.
...
Bug:3367446
bringPointIntoView was called by TextView in onPreDraw. This was
passing a message to the webcore thread to change the scroll
position. This is unnecessary, because typically the scroll
position will be changed by webkit when keys are pressed. The
one situation where this helped was when the user taps on a
textfield, which brings up the IME, which may cover it. A better
solution is to tell webkit to scroll it on screen once the
screen size changes. I have a CL in external/webkit to do that:
https://android-git.corp.google.com/g/#change,91095
Change-Id: I6e06ad59e1a1c99365bb5be635a43d1b88658c0d
2011-01-19 13:18:59 -05:00
Mike Lockwood
897f894e88
MTP: Close and reopen driver file after an error.
...
BUG: 3368665
Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:11:28 -08:00
James Dong
a2a3ea5dda
am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
...
* commit '1324e3b1a4246f77d516b37fa98013ffad91268e':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
2011-01-19 10:09:01 -08:00
James Dong
1324e3b1a4
am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
...
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
2011-01-19 10:06:23 -08:00
James Dong
4061c9aa6d
Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
2011-01-19 10:05:05 -08:00
Andreas Huber
e944c0fe02
am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
...
* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:53:30 -08:00
Andreas Huber
d3bf3eeadd
am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
...
* commit '2597aedb3869e46f945359c529e03263c77a944d':
Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:51:42 -08:00
Andreas Huber
2597aedb38
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
2011-01-19 09:49:32 -08:00
Eric Laurent
0d2e17f5d9
am 42ac3249: am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
...
* commit '42ac32498aea67a43f666946c4b77a376f54cfaf':
Tentative fix for issue 3362362.
2011-01-19 09:46:03 -08:00
Eric Laurent
42ac32498a
am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
...
* commit '42466b1cad4cec1aa746809dfcca702456415be4':
Tentative fix for issue 3362362.
2011-01-19 09:43:17 -08:00