Commit Graph

38903 Commits

Author SHA1 Message Date
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
Joe Onorato
71f7f67230 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
2010-09-16 12:03:41 -04:00
Joe Onorato
7747795af5 Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread 2010-09-16 09:02:35 -07:00
Eric Laurent
f0f95b8bc5 Fix problem in lvm effect bundle wrapper
When an effect was deleted while enabled, the count of enabled effects
in the bundle was not decremented. Resulted a state where if another effect
was still enabled, its process function was called only every other time.

Change-Id: I59a0c5b7f50f416a9ecadae297b42912e56ddd51
2010-09-16 09:02:16 -07:00
Joe Onorato
0d903bcd78 These are not javadoc tags, they are annotations in sample code. Escape them properly.
Change-Id: Ic3b9f2738a1f8ae8aa6a2a278f1d4ba3a7727b51
2010-09-16 11:55:35 -04:00
Mike Lockwood
c2206a0710 Changes to support MediaProvider refactoring
Update table columns in MediaStore and adjust media scanner MTP support.

Change-Id: Ide41315a6d7650aadb703f93c7e022fc5c40d4dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-16 11:49:13 -04:00
Amith Yamasani
e678f46ec4 Query refinement feature in SearchView.
New method : setQueryRefinementEnabled() which will either enable all suggestions
to have the little query refinement icon in the right or just the ones that have
a bit set in the new SUGGEST_FLAGS column of the suggestion provider cursor.
2010-09-16 06:37:26 -07:00
Steve Block
44c7197a8b Merge "Make DumpRenderTree2 appear in the 'Dev Tools' application" 2010-09-16 04:59:28 -07:00
Hung-ying Tyan
fa03cfaeeb am f4fd88f8: am c7510581: SipService: add log control, suppress ping log.
Merge commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3'

* commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3':
  SipService: add log control, suppress ping log.
2010-09-16 04:53:30 -07:00
Iain Merrick
10229b24d0 HTTP auth for Chromium HTTP stack (Java side)
The existing Java callbacks become JNI callbacks. We splice this
functionality into HttpAuthHandler, splitting the existing callbacks
off into a new package-private class HttpAuthHandlerImpl. The public
API is unchanged.

Corresponding C++ change: https://android-git.corp.google.com/g/63763

Change-Id: Ia9717b86cbd2c32f17a2f8fad0cec34419c1376b
2010-09-16 12:51:39 +01:00
Hung-ying Tyan
f4fd88f8d8 am c7510581: SipService: add log control, suppress ping log.
Merge commit 'c7510581b81d63536db7d46ca8533106c8cf57c6' into gingerbread-plus-aosp

* commit 'c7510581b81d63536db7d46ca8533106c8cf57c6':
  SipService: add log control, suppress ping log.
2010-09-16 04:50:25 -07:00
Chung-yih Wang
d6e15ab6aa am 170255b0: am d8f3d167: Add a new phone state ANSWERING.
Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
  Add a new phone state ANSWERING.
2010-09-16 04:48:15 -07:00
Chung-yih Wang
170255b0f0 am d8f3d167: Add a new phone state ANSWERING.
Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp

* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
  Add a new phone state ANSWERING.
2010-09-16 04:45:44 -07:00
Hung-ying Tyan
c7510581b8 SipService: add log control, suppress ping log.
Change-Id: I78332ddee1272be41b1fbc80c603e41200c6be1a
2010-09-16 19:45:20 +08:00
Iain Merrick
e99687c166 Update user agent string to match WebKit r67178.
Change-Id: I6ac4cf6cc0cee4f3baaa2f10b71d5706bfa781fa
2010-09-16 12:16:06 +01:00
Chung-yih Wang
d8f3d16735 Add a new phone state ANSWERING.
The state ANSWERING is set when we answer an incoming sip call, i.e.
sending a 'OK' response to the peer. The state will be set to ACTIVE
once the 'ACK' from peer is received.

Change-Id: I84ee3cc68222eb34e032896ce23f7431d4ad774a
2010-09-16 19:09:16 +08:00
Chung-yih Wang
0c2b04bb53 am 1e27dc97: am 0e063382: Fix the unhandled authentication message.
Merge commit '1e27dc978d5e929679f96eaed541c14b37cd1118'

* commit '1e27dc978d5e929679f96eaed541c14b37cd1118':
  Fix the unhandled authentication message.
2010-09-15 23:35:37 -07:00
Chung-yih Wang
1e27dc978d am 0e063382: Fix the unhandled authentication message.
Merge commit '0e0633828928481658c0e09e5893f6214b57ba38' into gingerbread-plus-aosp

* commit '0e0633828928481658c0e09e5893f6214b57ba38':
  Fix the unhandled authentication message.
2010-09-15 23:32:34 -07:00
Jeff Hamilton
5360eab8bb Fix deleting browser history.
Bug: 2953761
Change-Id: I19eba1f24c45ba092a583282b21d35391cfd1eb9
2010-09-16 00:46:48 -05:00
Chet Haase
4dcb8606a2 am 7ddff990: (-s ours) am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf'

* commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf':
  Adding new assets for designers
2010-09-15 21:53:07 -07:00
Jeff Brown
fa8186c716 am 7642c82c: am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Merge commit '7642c82c291051919aad87c797e2dc1d77ed55e1'

* commit '7642c82c291051919aad87c797e2dc1d77ed55e1':
  Make input dispatcher only ANR for foreground windows.
2010-09-15 21:42:28 -07:00
Chung-yih Wang
0e06338289 Fix the unhandled authentication message.
bug id: http://b/2991911

Change-Id: Iec86e3aee0fb12034ee25bc0e93fd575c1208a5f
2010-09-16 12:32:26 +08:00
David Brown
fcec46b3d4 resolved conflicts for merge of 9c43fffc to master
Change-Id: I6b5931bae7a9507b006c723db6c0b9589038e05c
2010-09-15 21:30:12 -07:00
Chet Haase
7ddff990ac am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp

* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
  Adding new assets for designers
2010-09-15 21:16:35 -07:00
Chet Haase
07980dc8a7 Merge "Adding new assets for designers" into gingerbread 2010-09-15 21:14:09 -07:00