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

13840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
91aa99f169 am 82bac8ec: am 59fc58dc: fix the build 
Merge commit '82bac8ece4d0e07f0490c9852b295f465acd1dee' into kraken

* commit '82bac8ece4d0e07f0490c9852b295f465acd1dee':
  fix the build
 2010-03-29 18:13:38 -07:00
Oscar Montemayor
e0cec3cea1 DO NOT MERGE 
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
 2010-03-29 18:12:24 -07:00
Joe Onorato
90137726d3 am 59fc58dc: fix the build 
Merge commit '59fc58dc3f164e33a96aee09505fac5818747cb6' into froyo-plus-aosp

* commit '59fc58dc3f164e33a96aee09505fac5818747cb6':
  fix the build
 2010-03-29 18:10:09 -07:00
Romain Guy
c83c4a2520 am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken

* commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
  Fix possible security issue.
 2010-03-29 16:40:43 -07:00
Romain Guy
bf63f52f42 am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp

* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
  Fix possible security issue.
 2010-03-29 16:34:46 -07:00
Ben Cheng
d20f3927eb am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken

* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:32:11 -07:00
Steve Howard
f940c77519 am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc' into kraken

* commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc':
  Remove upside-down portrait orientation.
 2010-03-29 16:32:05 -07:00
Romain Guy
77d90c3917 Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:31:14 -07:00
Ben Cheng
464e8c3ac2 am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp

* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:25:13 -07:00
Steve Howard
9a2697b08e am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit '8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp

* commit '8deb239169f9b60cf19b6f4293978e654fa15a03':
  Remove upside-down portrait orientation.
 2010-03-29 16:25:09 -07:00
Steve Howard
c088fd6a70 Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:05:35 -07:00
Christopher Tate
6891b43080 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
c1b97129ce 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
de85182970 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
200c9ee58b 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
70ffeb9849 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
473068e0de 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
Christopher Tate
094c65d083 Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 15:50:57 -07:00
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