ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,161 Commits 2 Branches 0 Tags 54 MiB
8869534faf
Commit Graph

21161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Dobjanschi
8869534faf Merge "Initial Video Editor API" 2010-09-16 16:40:12 -07:00
Romain Guy
223d427de7 Merge "Snap layer bounds to pixel boundaries." 2010-09-16 14:43:11 -07:00
Romain Guy
4809af3d8a Merge "Better error handling in the OpenGL renderer." 2010-09-16 14:18:22 -07:00
Vasu Nori
01aa06e237 Merge "change error message on cl I392875b62ed270741633f5bffa519932e4a9f985" 2010-09-16 14:01:12 -07:00
Steve Howard
ffd2328824 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-16 13:56:25 -07:00
Steve Howard
11ad16f2af am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread 
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'

* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
  Support new URI structure for download provider.
 2010-09-16 13:56:06 -07:00
Joe Onorato
356d41cece Merge "Make javadoc warnings into errors." 2010-09-16 13:56:01 -07:00
Joe Onorato
0c8627fec3 Merge "Fix broken javadoc." 2010-09-16 13:55:45 -07:00
Joe Onorato
a2e949ab4b Merge "There is no @note javadoc tag." 2010-09-16 13:55:21 -07:00
Steve Howard
7cf9bc124f am 47874718: Merge "Support new URI structure for download provider." into gingerbread 
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
 2010-09-16 13:45:51 -07:00
Steve Howard
3435d3bb55 Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
Jeff Brown
87fab277fd am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread 
Merge commit '61cf67a220ba3205737c646c1c836a92074220de'

* commit '61cf67a220ba3205737c646c1c836a92074220de':
  Input API review.
 2010-09-16 13:05:50 -07:00
Jeff Brown
cb6a0c6832 am 24326f72: Merge "Input API review." into gingerbread 
Merge commit '24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp

* commit '24326f7223275ba9c85014b86d42040e3a7d2815':
  Input API review.
 2010-09-16 13:01:54 -07:00
Jeff Brown
128e33421b Merge "Input API review." into gingerbread 2010-09-16 12:57:56 -07:00
Jeff Brown
0c8939f4c9 am 9284b454: am b9eb949b: Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread 
Merge commit '9284b454e28a49f514f9caddaace15b91d41165c'

* commit '9284b454e28a49f514f9caddaace15b91d41165c':
  Fix input dispatcher regression on launcher drag&drop.
 2010-09-16 12:44:17 -07:00
Jeff Brown
8505b801e0 am b9eb949b: Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread 
Merge commit 'b9eb949bcae977a3f86e8307f3854f157227c34c' into gingerbread-plus-aosp

* commit 'b9eb949bcae977a3f86e8307f3854f157227c34c':
  Fix input dispatcher regression on launcher drag&drop.
 2010-09-16 12:40:30 -07:00
Jeff Brown
f5ca35e583 Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread 2010-09-16 12:38:31 -07:00
Jeff Brown
405a1d32e9 Fix input dispatcher regression on launcher drag&drop. 
Change-Id: I40e937bd712cd2ed6cceac95dfd1b8c8e070724f
 2010-09-16 12:31:46 -07:00
Joe Onorato
ef0cddc85e am 390490e4: (-s ours) am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread 
Merge commit '390490e4ae768d541018038c782c52b471bb61de'

* commit '390490e4ae768d541018038c782c52b471bb61de':
  DO NOT MERGE - Doclava warnings are now errors.
 2010-09-16 11:56:27 -07:00
James Dong
a8e30825b7 am e30d039f: am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread 
Merge commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194'

* commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194':
  Fixed a bug in the query to the supported profiles and levels
 2010-09-16 11:56:16 -07:00
Joe Onorato
02e3c9e69e am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread 
Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp

* commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c':
  DO NOT MERGE - Doclava warnings are now errors.
 2010-09-16 11:49:39 -07:00
James Dong
b5792edc93 am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread 
Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp

* commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b':
  Fixed a bug in the query to the supported profiles and levels
 2010-09-16 11:47:17 -07:00
Joe Onorato
95cc90b601 Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread 2010-09-16 11:45:34 -07:00
James Dong
7e6085f270 Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread 2010-09-16 11:45:01 -07:00
Andreas Huber
63ce34be62 am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread 
Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656'

* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
  Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
 2010-09-16 11:39:43 -07:00
Andreas Huber
2b9f9821b1 am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread 
Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp

* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
  Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
 2010-09-16 11:36:12 -07:00
Joe Onorato
94c6e7e135 am a85c4f16: am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread 
Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'

* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
  This was marked @Deprecated in the docs, but it was misspelled.
 2010-09-16 11:35:39 -07:00
Dirk Dougherty
f9a38d1774 am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:32:30 -07:00
Jeff Brown
260b6d9319 am 03335af0: am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread 
Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c'

* commit '03335af0dbf14d1eb4503be92a5b10199719898c':
  Fix NPE when handling certain kinds of ANRs.
 2010-09-16 11:32:26 -07:00
Andreas Huber
2cd0ad397b Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread 2010-09-16 11:32:25 -07:00
Joe Onorato
6f3f8768a4 am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread 
Merge commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'

* commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
  Fix the rest of the javadoc warnings.
 2010-09-16 11:32:12 -07:00
Joe Onorato
faedd14a3a am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread 
Merge commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp

* commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7':
  This was marked @Deprecated in the docs, but it was misspelled.
 2010-09-16 11:29:09 -07:00
Joe Onorato
d0b88ef384 Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread 2010-09-16 11:26:30 -07:00
Dirk Dougherty
c8f05b0d1f am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:19:54 -07:00
Dirk Dougherty
8e70c906e9 Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 2010-09-16 11:16:29 -07:00
Jeff Brown
28de6a0ab6 am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread 
Merge commit '567c00a86f748ad4d798ae50a09505cc051fc095' into gingerbread-plus-aosp

* commit '567c00a86f748ad4d798ae50a09505cc051fc095':
  Fix NPE when handling certain kinds of ANRs.
 2010-09-16 11:08:46 -07:00
Jeff Brown
4fe5434b2d Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread 2010-09-16 11:06:29 -07:00
Jeff Brown
40ad470643 Fix NPE when handling certain kinds of ANRs. 
Change-Id: Iccef1852e52c84f6f49d30c491431460a10b33d3
 2010-09-16 11:02:16 -07:00
Andreas Huber
6bd903cd41 am 7a848c0d: am 8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance. 
Merge commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6'

* commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6':
  A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
 2010-09-16 10:56:47 -07:00
Joe Onorato
25ded276e8 am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread 
Merge commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'

* commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
  DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
 2010-09-16 10:56:30 -07:00
Eric Laurent
df966975c3 am d32d3011: am 37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread 
Merge commit 'd32d30119bd0c0988a6806f1205db5426235af52'

* commit 'd32d30119bd0c0988a6806f1205db5426235af52':
  Fix problem in lvm effect bundle wrapper
 2010-09-16 10:56:25 -07:00
Joe Onorato
93d6c5e399 am d35186ce: (-s ours) am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread 
Merge commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8'

* commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.
 2010-09-16 10:56:14 -07:00
Joe Onorato
3fe1120aac am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread 
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp

* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
  Fix the rest of the javadoc warnings.
 2010-09-16 10:41:54 -07:00
Joe Onorato
c18411e673 Merge "Fix the rest of the javadoc warnings." into gingerbread 2010-09-16 10:39:46 -07:00
Joe Onorato
0e309d0b05 Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." 2010-09-16 10:29:33 -07:00
Joe Onorato
902c118489 Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." 2010-09-16 10:29:20 -07:00
Andreas Huber
3d0358b9dd am 8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance. 
Merge commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa' into gingerbread-plus-aosp

* commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa':
  A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
 2010-09-16 10:02:52 -07:00
Joe Onorato
872ad4ae18 am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread 
Merge commit '8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp

* commit '8c9eacd9b9669642b052e3349d55c6a303f54b31':
  DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
 2010-09-16 09:27:56 -07:00
Eric Laurent
016cd00878 am 37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread 
Merge commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15' into gingerbread-plus-aosp

* commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15':
  Fix problem in lvm effect bundle wrapper
 2010-09-16 09:27:52 -07:00
Joe Onorato
d2ca897f68 am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread 
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp

* commit '7747795af508354b3792e497e6a7b4bc749b4007':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.
 2010-09-16 09:27:42 -07:00