47988 Commits

Author SHA1 Message Date
Andreas Huber
c8e14bf5d5 Merge "Delay signaling the end of audio playback until all frames have actually played." 2011-03-22 13:19:41 -07:00
Andreas Huber
4dc482daac Delay signaling the end of audio playback until all frames have actually played.
Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10
related-to-bug: 3404000
2011-03-22 13:18:09 -07:00
Dianne Hackborn
2e28aa8905 am b6955be9: am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit 'b6955be94a065f34275cc20161664871bd286f75':
  Now have a final API 12.
2011-03-22 13:08:01 -07:00
Dianne Hackborn
b6955be94a am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit 'b382a0543938e3161a26615e03d0929ba75ea705':
  Now have a final API 12.
2011-03-22 13:04:56 -07:00
Dianne Hackborn
b382a05439 am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
2011-03-22 13:01:19 -07:00
Dianne Hackborn
8dcd664760 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
James Dong
3c111d7815 Merge "Fix AAC encoder test util and remove files that are not needed" 2011-03-22 12:40:40 -07:00
James Dong
1056ec04cb Merge "Fix AMRWB test util and remove useless files" 2011-03-22 12:40:35 -07:00
Kenny Root
7dca6f1b9c Merge "Remove unused items in setInstallerPackageName" 2011-03-22 12:25:28 -07:00
shailendra
35c654c3f5 am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8e0f2d71a1d2353228ba04562c8189f4904a11d1':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:54:44 -07:00
shailendra
8e0f2d71a1 am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit 'b819dcd49ddd4be8f102c99576bb42cd088caf1a':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:52:25 -07:00
shailendra
b819dcd49d am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:50:15 -07:00
shailendra
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Gloria Wang
66044c1792 am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
  Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:43:09 -07:00
Andreas Huber
e50b799dc2 am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 11:42:51 -07:00
Teng-Hui Zhu
fdef2cb760 am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1
* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
  Fix a crash
2011-03-22 11:42:37 -07:00
Yu Shan Emily Lau
8b17346a43 am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
* commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3':
  Add the mem logging into test utility. Bug# 4108259
2011-03-22 11:42:26 -07:00
Gloria Wang
0043a76c78 am 97cd837e: (-s ours) am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '97cd837ec1e0eb87fb2a8a80a9789868fb5fecc7':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
2011-03-22 11:42:23 -07:00
Justin Ho
28dcbdcc15 am 263fb828: am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
* commit '263fb8285c79a37d3c9dbd0f70d307b92f1ed8fc':
  Fixing list selector theme Bug: 4147203
2011-03-22 11:42:20 -07:00
Andreas Huber
dce4a0f0d5 am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away.
* commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7':
  If nothing is to be copied, return right away.
2011-03-22 11:42:08 -07:00
Gloria Wang
fc4c13be8c am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit '012401774f4aac29ad8cf8e32f36c4a521842767':
  Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:08:38 -07:00
Gloria Wang
012401774f am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:06:43 -07:00
Gloria Wang
3cc797b9c4 Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 2011-03-22 11:04:32 -07:00
Adam Powell
37f421c594 Merge "Fix bug 3175131 - listviews don't highlight properly" 2011-03-22 10:48:52 -07:00
Dianne Hackborn
99ca5cc5c7 Now have a final API 12.
Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
2011-03-22 10:46:42 -07:00
Andreas Huber
71ba7d34bc am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '3da107288d5ae112073875ac10317def3c299818':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 08:55:51 -07:00
Andreas Huber
3da107288d am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 08:48:58 -07:00
Andreas Huber
453c0d5f16 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -07:00
Adam Powell
becb0be2bb Fix bug 3175131 - listviews don't highlight properly
Fix up selector drawable state when we resurrect a selection.

Change-Id: Id883c8b416207a50951ec2852826b1eee17bc50c
2011-03-22 00:21:07 -07:00
James Dong
bc40f9d27e Fix AMRWB test util and remove useless files
Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
2011-03-21 21:59:32 -07:00
Chia-chi Yeh
40e1bdb7ce Merge "Include strings.h instead of string.h for the strcasecmp prototype." 2011-03-21 21:49:29 -07:00
James Dong
9cd4844819 Fix AAC encoder test util and remove files that are not needed
Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
2011-03-21 20:55:06 -07:00
Carl Shapiro
3f9e08973f Include strings.h instead of string.h for the strcasecmp prototype.
Change-Id: I6b0ddc2408c30851edcffb36f1bc74245403ffc7
2011-03-21 20:21:40 -07:00
Gloria Wang
c430394ed7 Add one more field in DecryptHandle to support bug 4126624
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
2011-03-21 19:08:18 -07:00
Romain Guy
e455cd4164 Merge "Remove unnecessary test." 2011-03-21 18:22:03 -07:00
Romain Guy
566c33105a Remove unnecessary test.
Change-Id: I7cb797f4be70ecd40a65c51e92a8e8722e49dec2
2011-03-21 18:21:28 -07:00
Teng-Hui Zhu
c81d7e0ae8 am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1
* commit 'f2c44a79d90096e5f0edf698e27d291d439f0138':
  Fix a crash
2011-03-21 18:16:02 -07:00
Yu Shan Emily Lau
5460bb3e09 am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
* commit '112852b5770300a81d82f0ec06ad0553f286ed01':
  Add the mem logging into test utility. Bug# 4108259
2011-03-21 18:14:12 -07:00
Gloria Wang
97cd837ec1 am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '4f87a46e6f1a8ba601a320c902abc3d5ce010674':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
2011-03-21 18:14:09 -07:00
Justin Ho
263fb8285c am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
* commit '6a21161095326d097a1af3930b4af0d2470abe0b':
  Fixing list selector theme Bug: 4147203
2011-03-21 18:14:06 -07:00
Teng-Hui Zhu
f2c44a79d9 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Andreas Huber
6834f0617a am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away.
* commit '970d7dd95f704fb068c8add784f5b8c1c17ebd3c':
  If nothing is to be copied, return right away.
2011-03-21 18:05:50 -07:00
Yu Shan Emily Lau
112852b577 am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
2011-03-21 18:00:32 -07:00
Gloria Wang
4f87a46e6f am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
2011-03-21 18:00:30 -07:00
Justin Ho
6a21161095 am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
2011-03-21 17:59:59 -07:00
Eric Laurent
931b7f269c Merge "Fix issue 3509396: AudioEffect.getParameter JAVA." 2011-03-21 17:51:25 -07:00
Teng-Hui Zhu
217c6c7fbe am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '67440893ee32f057d2695b0eea9811e289b68603':
  Support loading image and paused image for inline video
2011-03-21 17:48:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
2011-03-21 17:38:21 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00