ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity
13,768 Commits 2 Branches 0 Tags 54 MiB
174b935bdc
Commit Graph

13768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
12362a245a Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo 2010-03-29 15:44:48 -07:00
Mathias Agopian
30dd5baa52 Merge "fix [2542425] memory leak during video recording" into froyo 2010-03-29 15:44:33 -07:00
Dirk Dougherty
8554845131 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
6c6065e140 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
bd6e90ccab 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
27521d041a 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
be447b6ed5 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
Andreas Huber
42d211ff85 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
fa60d398a5 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
Mathias Agopian
8fb47ec10e 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
1cd6aeed3d 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
61cd3a2648 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
4a5ca158f9 Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
6b5bf8d72c 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
c675a07ea5 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
cedfe8eef5 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
Doug Zongker
d6fb6a46ef 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
2b44645a8a 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
6113679090 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
19ed7d126d 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
Mathias Agopian
caeddc7236 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
Romain Guy
387d3b631b 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
Dirk Dougherty
ffdd5668d1 am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 
Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp

* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
  doc change: Indicate that only the first 8 characters of the key alias are used.
 2010-03-29 13:06:17 -07:00
Andreas Huber
40d1cbad0e 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 to ns." into 
Merge commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad' into kraken

* commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad':
  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 to ns.
 2010-03-29 13:06:11 -07:00
Andreas Huber
b8de98f11f 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 to ns." into froyo 
Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp

* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
  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 to ns.
 2010-03-29 13:01:27 -07:00
Jean-Baptiste Queru
975159c1d0 am 9d0f6dfd: Fix build 
Merge commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9' into kraken

* commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9':
  Fix build
 2010-03-29 13:01:26 -07:00
Romain Guy
3a22b0982a Merge "Tame the monkey. Bug #2547546" into froyo 2010-03-29 13:00:42 -07:00
Dirk Dougherty
37f9b40168 Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 2010-03-29 13:00:37 -07:00
Andreas Huber
36b3cfdfe2 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 to ns." into froyo 2010-03-29 12:58:03 -07:00
Romain Guy
9cf67b57cb am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 
Merge commit '7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken

* commit '7e31b282ddd1f4296ba702f7604044216a95f65e':
  Rename private fields to break bad code examples
 2010-03-29 12:37:48 -07:00
Romain Guy
6c1c0bd44c am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
 2010-03-29 12:34:23 -07:00
Romain Guy
e71096b88b Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Jack Palevich
b167e42c71 am cdb9839a: am 5d961085: Add a test of EGL pausing and resuming. 
Merge commit 'cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken

* commit 'cdb9839a569819f233c6d0d9658ffa1fab938794':
  Add a test of EGL pausing and resuming.
 2010-03-29 12:24:48 -07:00
Jack Palevich
83d6f3a91b am 5d961085: Add a test of EGL pausing and resuming. 
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp

* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
  Add a test of EGL pausing and resuming.
 2010-03-29 12:22:08 -07:00
Jack Palevich
4b1409812a Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Irfan Sheriff
9d79ea49fb am 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo 
Merge commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa' into kraken

* commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
 2010-03-29 12:12:48 -07:00
Irfan Sheriff
871a165bd5 am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo 
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
 2010-03-29 12:07:37 -07:00
Romain Guy
0a1c1e2d9c am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken

* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
  Make EditTextPreference scrollable.
 2010-03-29 11:32:53 -07:00
Romain Guy
f145871a82 am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
 2010-03-29 11:28:07 -07:00
Romain Guy
7416faf474 Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
The Android Open Source Project
a6523328b8 am 5849606d: merge from open-source master 
Merge commit '5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken

* commit '5849606df71fb3d5ce88b966cff8382deccd56b6':
  Fix typos in comment.
  CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
 2010-03-29 11:10:32 -07:00
The Android Open Source Project
902bb36798 merge from open-source master 
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
 2010-03-29 11:04:30 -07:00
The Android Open Source Project
dfb969e693 am c89704a7: merge from open-source master 
Merge commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken

* commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
  Fix Memory Leak When Switching Input Methods
 2010-03-29 11:03:33 -07:00
The Android Open Source Project
512f431601 merge from open-source master 
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
 2010-03-29 10:57:04 -07:00
Daniel Lehmann
00bc318438 am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
 2010-03-29 10:37:41 -07:00
Daniel Lehmann
f4edb1a5e7 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
8fcda8069e am 0737d77a: Merge "Implement audio focus support in the notification manager." into froyo 
Merge commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken

* commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
  Implement audio focus support in the notification manager.
 2010-03-29 10:14:28 -07:00
Jean-Michel Trivi
472cc8e787 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Grace Kloba
b1a0cfb451 am 51b97011: cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo 
Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken

* commit '51b97011b73c10b832ea4ad10637f761802e125d':
  cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
 2010-03-29 09:44:05 -07:00
Leon Clarke
cfa4b21ffb am 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed. 
Merge commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken

* commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926':
  http://b/issue?id=2496591
 2010-03-29 09:10:58 -07:00