Eric Laurent
28e8c9423c
am 10f4ffe9: Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb
...
* commit '10f4ffe9619ca3a943e3460d8bb7b5441575a173':
Issue 3315999: catch ToneGenerator exceptions.
2011-01-19 12:19:51 -08:00
Eric Laurent
10f4ffe961
Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb
2011-01-19 12:18:10 -08:00
Shih-wei Liao
cbcced2d15
c99 bool support
...
Change-Id: I0990425a9362d3ef6ea0b40bf6f00fcc10eed426
2011-01-19 12:17:54 -08:00
Eric Laurent
733a42b24b
Issue 3315999: catch ToneGenerator exceptions.
...
When the AudioFlinger runs out of available AudioTracks (max 32),
the ToneGenerator constructor throws a RuntimeException. Although this
denotes an abnormal situation, VolumePanel should catch this exception.
Change-Id: Ida1312fe4857e99a0ef38b4013cb03e819405689
2011-01-19 12:16:19 -08:00
Dharmaray Kundargi
6dbd3ee67b
remove eng developement local tags in make file
...
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
2011-01-19 12:14:46 -08:00
Costin Manolache
de2964ec0a
am f5ffe89e: Token cache was not reset on password change
...
* commit 'f5ffe89e736caee1419f0acb469565d5100b8fb8':
Token cache was not reset on password change
2011-01-19 12:03:26 -08:00
Romain Guy
cdc2f68a4a
am 34829553: Merge "Fix the fix for 9patches." into honeycomb
...
* commit '34829553a803d37ae3555579f4aa130e652644d9':
Fix the fix for 9patches.
2011-01-19 12:01:20 -08:00
Costin Manolache
f5ffe89e73
Token cache was not reset on password change
...
Bug: 3365443
Change-Id: I3e85c56810c0d71ddc82d3c6a1dcbba640444564
2011-01-19 12:00:32 -08:00
Romain Guy
a3311ed7a9
Fix the fix for 9patches.
...
Change-Id: I66dca835d9d0e9766d887746c3265e4b13ae688b
2011-01-19 12:00:08 -08:00
Andreas Huber
4026ea7c25
am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
...
* commit '0353459d405e20750b3ddd8abad83eace1ed2a39':
Always revert to the previous bandwidth if the required sequence number cannot be found
2011-01-19 11:59:14 -08:00
Romain Guy
34829553a8
Merge "Fix the fix for 9patches." into honeycomb
2011-01-19 11:58:21 -08:00
Andreas Huber
0353459d40
Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
2011-01-19 11:56:15 -08:00
James Dong
da58076a6b
Logging the duration range from different media tracks for recording
...
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
2011-01-19 11:54:59 -08:00
James Dong
894339298e
am 4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb
...
* commit '4f28901f2a15f566a98bf5d14ac510e05401f960':
Turn error/exception logging on at the native layer
2011-01-19 11:52:56 -08:00
James Dong
4f28901f2a
Merge "Turn error/exception logging on at the native layer" into honeycomb
2011-01-19 11:50:16 -08:00
Adam Cohen
9f97174b9b
am c446ae83: Merge "Removing deprecated widget api method." into honeycomb
...
* commit 'c446ae83e08fb451589dbacba9aa3f89d0d6acb0':
Removing deprecated widget api method.
2011-01-19 11:49:44 -08:00
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
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
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
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
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
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
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
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
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
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
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