31508 Commits

Author SHA1 Message Date
Joe Onorato
723331bde3 There is no @note javadoc tag.
Change-Id: I6fb9f695426f958f35c30dab3426765effaabeb8
2010-09-16 16:01:53 -04:00
Jeff Brown
24326f7223 Merge "Input API review." into gingerbread 2010-09-16 12:57:56 -07:00
Jeff Brown
6cca469ed6 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
9284b454e2 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
b9eb949bca Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread 2010-09-16 12:38:31 -07:00
Jeff Brown
2a95c2a9ec Fix input dispatcher regression on launcher drag&drop.
Change-Id: I40e937bd712cd2ed6cceac95dfd1b8c8e070724f
2010-09-16 12:31:46 -07:00
Joe Onorato
6dc2a9f30c 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
1b0c3e2a44 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
390490e4ae 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
e30d039f0e 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
ad7bce4ca2 Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread 2010-09-16 11:45:34 -07:00
James Dong
a7f5e476d5 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
33708a058c 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
62d4ebc042 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
8c256274ac 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
James Dong
dfb89914d4 Fixed a bug in the query to the supported profiles and levels
According to OMX spec, the levels returned is the max level settings.
In fact, we could not enum all the levels.

Change-Id: Ib1cba74100512800a5761c7567894c7ea5b5a452
2010-09-16 11:34:20 -07:00
Dirk Dougherty
40da25a26e 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
b27d07cccf 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
49e1ae2280 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
04065bdcca 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
b9f03d51c2 DO NOT MERGE - Doclava warnings are now errors.
Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
2010-09-16 14:30:16 -04:00
Joe Onorato
a85c4f1651 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
d5d1328690 Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread 2010-09-16 11:26:30 -07:00
Joe Onorato
3d37fca57d This was marked @Deprecated in the docs, but it was misspelled.
Change-Id: Ic8bd8f53b205da46510ddc7f2ffaec16758a4639
2010-09-16 14:25:10 -04:00
Dirk Dougherty
8ee9ecc145 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
9afd90939b Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 2010-09-16 11:16:29 -07:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros.
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
2010-09-16 11:08:57 -07:00
Jeff Brown
03335af0db 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
567c00a86f Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread 2010-09-16 11:06:29 -07:00
Jeff Brown
dc3e00563e Fix NPE when handling certain kinds of ANRs.
Change-Id: Iccef1852e52c84f6f49d30c491431460a10b33d3
2010-09-16 11:02:16 -07:00
Andreas Huber
f146cb4479 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
33c7a52fa4 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
9e6f16a5d0 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
1926741580 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
ee76ed9c0d 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
4198cececf Merge "Fix the rest of the javadoc warnings." into gingerbread 2010-09-16 10:39:46 -07:00
Joe Onorato
d3ad696b1d Fix the rest of the javadoc warnings.
Change-Id: Ifbf422a2eb177858813d118f03ceddcd807e73b4
2010-09-16 13:38:25 -04:00
Joe Onorato
1e7259d88e 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
025af69259 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
45922df0f2 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.
Change-Id: I6c0782b51b57e9be0fd410bd34078dc3c2b088d6
related-to-bug: 3005156
2010-09-16 10:25:34 -07:00
Andreas Huber
7a848c0d7c 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
Vasu Nori
6728ebfa92 STOPSHIP some debugging code to help find reproducible testcases
sometimes mReferenceCount in SQLiteCloasable.java has some huge number
(a memory address probably)
this causes a database.close() or sqliteStatement.close() to randomly
fail and not release the object. and that usually causes a finalizer
warning or sqlite to return error "dbclose failed due to
unfinalised statements"

Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
2010-09-16 09:57:42 -07:00
Joe Onorato
0b6232da89 These are not javadoc tags, they are annotations in sample code. Escape them properly. 2010-09-16 12:57:18 -04:00
Andreas Huber
8946ab2618 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.
Change-Id: I57a798b00adeb2c8056e85aab29a2b57aef00b63
2010-09-16 09:44:40 -07:00
Joe Onorato
d20e5d0a29 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Change-Id: Ifa46210d1e590e5298376539b6099452d85ef93d
2010-09-16 12:38:42 -04:00
Joe Onorato
f8a93cb7b9 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
d32d30119b 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
d35186ce18 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
Joe Onorato
8c9eacd9b9 Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread 2010-09-16 09:04:43 -07:00
Eric Laurent
37de5da03b Merge "Fix problem in lvm effect bundle wrapper" into gingerbread 2010-09-16 09:04:37 -07:00