Jack Palevich
eae38936a3
Merge "Add a test program for Sapphire viewport rotation issue."
2010-03-29 16:12:11 -07:00
Christopher Tate
de0d50f8b7
am 2eb13d3f: am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
2010-03-29 16:07:47 -07:00
Mathias Agopian
b33e8741d7
am de984ec8: am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
2010-03-29 16:07:44 -07:00
Mathias Agopian
6f1765b3a1
am 22db6f53: am 6874362a: am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo
2010-03-29 16:07:39 -07:00
Jack Palevich
c49eeba5d8
Add a test program for Sapphire viewport
...
rotation issue.
2010-03-29 16:04:21 -07:00
Christopher Tate
2eb13d3f46
am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
...
Merge commit '245df5ad16ff227761906c10dc97c01901232666' into kraken
* commit '245df5ad16ff227761906c10dc97c01901232666':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
2010-03-29 15:57:01 -07:00
Mathias Agopian
de984ec8dc
am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
...
Merge commit '0815235ffceb9e079185c1a3c78e2793157523f9' into kraken
* commit '0815235ffceb9e079185c1a3c78e2793157523f9':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
2010-03-29 15:56:57 -07:00
Mathias Agopian
22db6f535e
am 6874362a: am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo
...
Merge commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken
* commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
fix [2542425] memory leak during video recording
2010-03-29 15:56:54 -07:00
Christopher Tate
245df5ad16
am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
...
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
2010-03-29 15:53:54 -07:00
Mathias Agopian
0815235ffc
am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
...
Merge commit 'a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp
* commit 'a019df875d991ce61c93720f37c036655723f5f6':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
2010-03-29 15:53:48 -07:00
Mathias Agopian
6874362a6b
am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo
...
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [2542425] memory leak during video recording
2010-03-29 15:53:44 -07:00
Dirk Dougherty
eb7aca1dea
am 5bfa807a: am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
2010-03-29 15:51:35 -07:00
Andreas Huber
889dd83a6d
am 581ee3a9: am 538c310b: am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
2010-03-29 15:51:30 -07:00
Jim Miller
e33b93206b
am baaa33a3: am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
2010-03-29 15:51:26 -07:00
Christopher Tate
3f264c4fba
Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
2010-03-29 15:50:57 -07:00
Christopher Tate
cc84c69726
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
...
Part of bug #2545514
Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
2010-03-29 15:48:14 -07:00
Mathias Agopian
a019df875d
Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo
2010-03-29 15:44:48 -07:00
Mathias Agopian
04fdd180cc
Merge "fix [2542425] memory leak during video recording" into froyo
2010-03-29 15:44:33 -07:00
Dirk Dougherty
5bfa807a6f
am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
...
Merge commit '6c75455908579c1bd48777847c0861967bc413a9' into kraken
* commit '6c75455908579c1bd48777847c0861967bc413a9':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
2010-03-29 15:43:23 -07:00
Andreas Huber
581ee3a9f3
am 538c310b: am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
...
Merge commit '538c310b091a6cc74020423deed9d62703f3f13f' into kraken
* commit '538c310b091a6cc74020423deed9d62703f3f13f':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
2010-03-29 15:43:19 -07:00
Dirk Dougherty
6c75455908
am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
...
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
2010-03-29 15:39:56 -07:00
Andreas Huber
538c310b09
am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
...
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp
* commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
2010-03-29 15:39:53 -07:00
Dirk Dougherty
c46f28dc0f
Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
2010-03-29 15:36:53 -07:00
Romain Guy
6ed3b01104
am b7819f74: am e0f9e735: am 89d4e2dd: Fix the buid!
2010-03-29 15:17:09 -07:00
Andreas Huber
02a1f78987
Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
2010-03-29 15:16:20 -07:00
Jim Miller
baaa33a378
am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
...
Merge commit 'd41d458696b2ab54387dd0683a3365e788b97c2d' into kraken
* commit 'd41d458696b2ab54387dd0683a3365e788b97c2d':
Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
2010-03-29 15:14:27 -07:00
Romain Guy
b741169d7e
am 2aba9b1e: am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
2010-03-29 15:14:13 -07:00
Andreas Huber
c2eeb2f52e
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
...
Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6
related-to-bug: 1903971
2010-03-29 15:13:40 -07:00
Mathias Agopian
a5d4ad3d52
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
...
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
2010-03-29 15:12:19 -07:00
Jim Miller
d41d458696
am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
...
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp
* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
2010-03-29 15:11:01 -07:00
Romain Guy
b7819f7441
am e0f9e735: am 89d4e2dd: Fix the buid!
...
Merge commit 'e0f9e735e47b3c9e0d7a7486040aca8bb7ecb4c4' into kraken
* commit 'e0f9e735e47b3c9e0d7a7486040aca8bb7ecb4c4':
Fix the buid!
2010-03-29 15:10:43 -07:00
Jim Miller
c6dc5070ef
Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo
2010-03-29 15:07:06 -07:00
Romain Guy
2aba9b1e21
am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
...
Merge commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken
* commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 15:05:11 -07:00
Romain Guy
e0f9e735e4
am 89d4e2dd: Fix the buid!
...
Merge commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1' into froyo-plus-aosp
* commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1':
Fix the buid!
2010-03-29 15:05:05 -07:00
Romain Guy
89d4e2dd78
Fix the buid!
...
Change-Id: Ia6e57da393f04209b180e131df74c24e62052d8c
2010-03-29 14:58:11 -07:00
Romain Guy
21ad6043cd
am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
...
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp
* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 14:49:09 -07:00
Dirk Dougherty
d76ef97930
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
...
Bug: 2554090
Change-Id: Ia13b3d156d230609e8296a3b31c2882ba13681f3
2010-03-29 14:47:39 -07:00
Romain Guy
6b1e696982
Rename tab widget attributes, remove scroll barrier constant.
...
Bug #2553515 #2553595
Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
2010-03-29 14:40:34 -07:00
Doug Zongker
18867a93e8
am e1599d86: am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*
2010-03-29 14:13:53 -07:00
Romain Guy
c6fb53e650
am 6757aed3: am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
2010-03-29 14:13:49 -07:00
Dirk Dougherty
80fc48c71c
am 708a0110: am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
2010-03-29 14:13:44 -07:00
Andreas Huber
9d9853d241
am f5ca73be: am 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us
2010-03-29 14:13:40 -07:00
Doug Zongker
e1599d86ea
am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*
...
Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken
* commit '0d531f5b5927556fd94e44eedacb678f6341479b':
relocate android.util.base64.* -> android.util.*
2010-03-29 14:05:01 -07:00
Romain Guy
6757aed35d
am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
...
Merge commit 'e16741b22a55289bd22787b91842b410213556f6' into kraken
* commit 'e16741b22a55289bd22787b91842b410213556f6':
Tame the monkey.
2010-03-29 14:04:58 -07:00
Dirk Dougherty
708a01106c
am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
...
Merge commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken
* commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
doc change: Indicate that only the first 8 characters of the key alias are used.
2010-03-29 14:04:55 -07:00
Doug Zongker
0d531f5b59
am ab69e29c: relocate android.util.base64.* -> android.util.*
...
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp
* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
relocate android.util.base64.* -> android.util.*
2010-03-29 14:00:58 -07:00
Doug Zongker
ab69e29c19
relocate android.util.base64.* -> android.util.*
...
b/2553469 - API REVIEW: android.util.base64
Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
2010-03-29 13:46:47 -07:00
Mathias Agopian
d741452853
fix [2542425] memory leak during video recording
...
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
2010-03-29 13:45:18 -07:00
Jean-Baptiste Queru
3330ae6324
am b5d9614f: am 9d0f6dfd: Fix build
2010-03-29 13:09:15 -07:00
Romain Guy
e16741b22a
am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
...
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp
* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
Tame the monkey.
2010-03-29 13:06:20 -07:00
