Eric Hassold
3ede7c133a
Check for initialized EGLDisplay when required by specification
...
Check for initialized display, and set EGL error to EGL_NOT_INITIALIZED
whenever it isn't, for all EGL functions taking an EGLDisplay as argument
and requiring it to have been initialized.
Bug: 3366011
Change-Id: Ib1d8a3a207257995518f4430fe97f8c406c7fc13
2011-03-23 15:59:00 -07:00
Adam Powell
bf65d240a3
Merge "Fix bug 4142917 - Add support for specifying a custom home icon in action bar"
2011-03-22 14:13:34 -07:00
Vasu Nori
a58af3c2df
Merge "bug:4090903 allow bindargs on attach database statement"
2011-03-22 14:09:01 -07:00
Eric Fischer
24c1a47cb1
am 17fd0a4b: (-s ours) am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '17fd0a4be9695f644e538e613a145cea3a9b583e':
Import revised translations. DO NOT MERGE
2011-03-22 14:03:13 -07:00
Eric Fischer
03a0b0236d
am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'b05f0b84b23729fcaa2dfe3955a4384b8c9cd440':
Import revised translations. DO NOT MERGE
2011-03-22 14:01:10 -07:00
Teng-Hui Zhu
f48444a5be
am 6e5276cf: am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '6e5276cf001112f93b3ca811d220331cc74cd8df':
fix for pause when loading
2011-03-22 14:00:20 -07:00
Eric Fischer
e0b5cead10
am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
Import revised translations. DO NOT MERGE
2011-03-22 13:59:20 -07:00
Teng-Hui Zhu
5a158def40
am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a':
fix for pause when loading
2011-03-22 13:58:16 -07:00
Eric Fischer
3e8b4373f1
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
632de2d17f
am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
fix for pause when loading
2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
ae01e99c1a
Merge "fix for pause when loading" into honeycomb-mr1
2011-03-22 13:55:28 -07:00
Kenny Root
f657a3827f
Merge changes Ie62206f8,Ib44c2b9f,I72ddeeae,If7fb1ce8,I62e6cb80
...
* changes:
Add generic types and more cleanup
PackageManager: Remove unused methods and more debug flags
PackageManager: mark some ints final
PackageManager: get rid of Config.LOG[DV]
Reorganize imports for PackageManagerService
2011-03-22 13:40:40 -07:00
Carl Shapiro
14b90f80e7
Merge "Include strings.h for the strcasecmp prototype."
2011-03-22 13:37:59 -07:00
Andreas Huber
77cb3dbe68
Merge "Delay signaling the end of audio playback until all frames have actually played."
2011-03-22 13:19:41 -07:00
Dianne Hackborn
e2c17481d5
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
175e5cdd6e
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
594b57954b
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
38475e7294
Merge "Now have a final API 12." into honeycomb-mr1
2011-03-22 12:58:00 -07:00
James Dong
bcefdbf367
Merge "Fix AAC encoder test util and remove files that are not needed"
2011-03-22 12:40:40 -07:00
James Dong
8e9e242094
Merge "Fix AMRWB test util and remove useless files"
2011-03-22 12:40:35 -07:00
Kenny Root
9872648861
Merge "Remove unused items in setInstallerPackageName"
2011-03-22 12:25:28 -07:00
shailendra
ef02c7c2be
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
82daa0c611
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
5096f083b6
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
6e7b75f517
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
2011-03-22 11:48:12 -07:00
Gloria Wang
6fdc5b6491
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
8ce16a978b
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
667d4aaea4
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
6d73dc1850
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
7b1d261074
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
77c9e544e2
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
22540a5751
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
94bfd3bed9
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
79ee4c6b6e
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
cbd0c8a74f
Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
2011-03-22 11:04:32 -07:00
Adam Powell
47f8173b2a
Merge "Fix bug 3175131 - listviews don't highlight properly"
2011-03-22 10:48:52 -07:00
Andreas Huber
1bc4e51040
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
bb76e23360
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
2a15f0fb93
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
Chia-chi Yeh
2e29361ae1
Merge "Include strings.h instead of string.h for the strcasecmp prototype."
2011-03-21 21:49:29 -07:00
Carl Shapiro
3bafffb1bd
Include strings.h for the strcasecmp prototype.
...
Change-Id: I0659ce2186547274e58f8b2027e16d3e45189353
2011-03-21 20:26:25 -07:00
Romain Guy
7473349525
Merge "Remove unnecessary test."
2011-03-21 18:22:03 -07:00
Teng-Hui Zhu
d648f7366a
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
59eaba8b72
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
01facd0ad0
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
6e0035ceb3
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
da63f57cb6
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
0cccea1543
Merge "Fix a crash" into honeycomb-mr1
2011-03-21 18:09:57 -07:00
Andreas Huber
cf9c475885
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
7eca96ee8d
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