Dmitri Plotnikov
44a29dd097
Adding "test context" to AndroidTestCase
2009-08-03 14:27:20 -07:00
Grace Kloba
f6d1a5528e
resolved conflicts for merge of b8802b21 to master
2009-08-03 10:49:58 -07:00
Android (Google) Code Review
8050220374
Merge change 9259
...
* changes:
Fix the cookie order. If multiple cookies satisfy the criteria, the one with more specfic Path precede thoese with less specific.
2009-08-03 10:23:58 -07:00
Android (Google) Code Review
b8802b2138
Merge change 9330 into donut
...
* changes:
Fix #2025900 . If a https request is canceled while openConnection is called and a ssl error happened, the http thread can be blocked for up to 10 min. Added code to detect this case and unlock the thread.
2009-08-03 10:07:00 -07:00
Grace Kloba
f4046ba803
Fix the cookie order. If multiple cookies satisfy the criteria, the one with
...
more specfic Path precede thoese with less specific.
2009-08-03 10:05:39 -07:00
Android (Google) Code Review
f2beab58f3
Merge change 9455
...
* changes:
Close the "Please connect charger" alert after a charger is connected.
2009-08-03 06:39:15 -07:00
Hung-ying Tyan
cc0fba056d
am 93540670: Issue an error when VPN connection is lost.
...
Merge commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba'
* commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba':
Issue an error when VPN connection is lost.
2009-08-03 01:38:00 -07:00
Hung-ying Tyan
935406709e
Issue an error when VPN connection is lost.
...
+ Add new error code CONNECTION_LOST to VpnManager.
+ Make VpnService call onError() instead of onDisconnect() when
connection is lost.
+ Make VpnService broadcast CONNECTION_LOST when that happens.
2009-08-03 16:22:24 +08:00
Chung-yih Wang
6a10330eb6
am dc1d5704: Fix the auto notification cleanup when vpn is disconnected.
...
Merge commit 'dc1d5704a725d207b98de1b117847297958d9148'
* commit 'dc1d5704a725d207b98de1b117847297958d9148':
Fix the auto notification cleanup when vpn is disconnected.
2009-08-03 00:16:23 -07:00
Chung-yih Wang
dc1d5704a7
Fix the auto notification cleanup when vpn is disconnected.
...
+ add the log print if the browser give the incorrect data in addCertificate().
2009-08-03 15:11:36 +08:00
Tammo Spalink
98aed46992
relax ia5 parsing, and combine with ascii
2009-08-03 10:30:10 +08:00
Mike Lockwood
69eb0bfcce
Close the "Please connect charger" alert after a charger is connected.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-01 23:02:28 -04:00
Jeff Sharkey
1132200fa1
Added an extra for sharing a target rectangle extra.
...
Used to pass a location using screen coordinates when
starting a SHOW_OR_CREATE_CONTACT activity.
2009-08-01 17:22:34 -07:00
Jeff Sharkey
732da9293a
Separated IM protocol into two fields, similar to TYPE.
...
In previous releases, we had combined well-known protocols
and custom protocols into a single field. This was because
of previous database constraints, which no longer exist
because of our new Data table approach.
2009-08-01 16:08:40 -07:00
Evan Millar
b3ac9318ef
Adds the ContactHeaderWidget for use by system apps.
...
The ContactHeaderWidget is a new widget that is used as a header banner
in various system applications, including contacts, mms, and gtalk.
Convenience methods are supplied for bind the widget to a specific
contact, which can be specified by contact id, email, or phone number.
2009-08-01 15:59:08 -07:00
Android (Google) Code Review
cf31b1bcbe
Merge change 9397
...
* changes:
Fix Win32 libutils to get a working SDK build.
2009-08-01 01:55:07 -07:00
David 'Digit' Turner
078a275784
Fix Win32 libutils to get a working SDK build.
2009-08-01 10:53:29 +02:00
Romain Guy
fcaa31bf65
Clean up Grass RS
2009-07-31 23:30:07 -07:00
Romain Guy
a32d100b34
Add new utility methods to rsScriptC_Lib, android.util.MathUtil and android.graphics.Color.
...
Fixes RS compilation.
2009-07-31 21:36:18 -07:00
Android (Google) Code Review
4aa38681c6
Merge change 9439
...
* changes:
Split RenderScript Type and Allocation into seperate classes.
2009-07-31 20:42:29 -07:00
Jason Sams
b8c5a84e7c
Split RenderScript Type and Allocation into seperate classes.
2009-07-31 20:40:47 -07:00
Android (Google) Code Review
dbf5f0cf42
am b86bad94: Merge change 9438 into donut
...
Merge commit 'b86bad9493a331a09dd765bc6e725c0aec969ff6'
* commit 'b86bad9493a331a09dd765bc6e725c0aec969ff6':
Change some log.i to log.d.
2009-07-31 20:18:23 -07:00
Android (Google) Code Review
b86bad9493
Merge change 9438 into donut
...
* changes:
Change some log.i to log.d.
2009-07-31 20:15:15 -07:00
Hung-ying Tyan
e81f51f44b
Change some log.i to log.d.
2009-08-01 10:11:46 +08:00
Android (Google) Code Review
3161d6dc2e
Merge change 9430
...
* changes:
Update docs.
2009-07-31 17:59:53 -07:00
Joe Onorato
37296dc4ed
Update docs.
2009-07-31 17:58:55 -07:00
Jean-Baptiste Queru
1e6e2489ae
am 3159e326: Merge snapshot variant of donut back into the tree
...
Merge commit '3159e3260e7e380469b5af353cc8af17525dbf20'
* commit '3159e3260e7e380469b5af353cc8af17525dbf20':
donut snapshot
2009-07-31 17:47:39 -07:00
Jean-Baptiste Queru
3159e3260e
Merge snapshot variant of donut back into the tree
2009-07-31 17:43:58 -07:00
Jean-Baptiste Queru
5c1207be90
donut snapshot
2009-07-31 17:38:20 -07:00
Android (Google) Code Review
11d6728af1
Merge change 9413
...
* changes:
Begin splitting up RenderScript.java into seperate classes. First piece split off Element.
2009-07-31 16:29:11 -07:00
Jason Sams
36e612a488
Begin splitting up RenderScript.java into seperate classes. First piece split off Element.
2009-07-31 16:26:13 -07:00
Android (Google) Code Review
d3d88ddab7
Merge changes 9415,9416
...
* changes:
log opengl-call-with-no-context only once per thread, instead of for each function call
don't crash in Parcel when given a null (and therfore invalid) native_handle_t
2009-07-31 16:25:49 -07:00
Mathias Agopian
997d107078
log opengl-call-with-no-context only once per thread, instead of for each function call
2009-07-31 16:23:03 -07:00
Mathias Agopian
f1db4aec65
don't crash in Parcel when given a null (and therfore invalid) native_handle_t
2009-07-31 16:18:16 -07:00
Android (Google) Code Review
b5a57ad943
Merge change 9391
...
* changes:
be more robust when errors occur upon EGL surface creation (ie: don't crash)
2009-07-31 15:12:54 -07:00
Mathias Agopian
abac01052c
be more robust when errors occur upon EGL surface creation (ie: don't crash)
2009-07-31 14:47:00 -07:00
Grace Kloba
d3c6d54de9
Set touch mode to be TOUCH_DONE_MODE when calling doDoubleTap.
2009-07-31 14:28:41 -07:00
Scott Main
e452240493
am af09b67f: add api level doc to the appendix
...
Merge commit 'af09b67f31195340623ced993f71c8b1a248b9a3'
* commit 'af09b67f31195340623ced993f71c8b1a248b9a3':
add api level doc to the appendix
2009-07-31 14:22:02 -07:00
Scott Main
af09b67f31
add api level doc to the appendix
2009-07-31 13:11:07 -07:00
Android (Google) Code Review
13f17c9515
Merge change 9372
...
* changes:
The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
2009-07-31 13:10:51 -07:00
Andreas Huber
1de13168a9
The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
2009-07-31 12:48:53 -07:00
Leon Scroggins
4c94304508
Fix a bug in find.
...
Make setContentScrollBy return a boolean.
Necessary so that a caller of setContentScrollBy in WebView.cpp
can find out whether the page scrolled. Requires a change in
external/webkit/
2009-07-31 15:28:18 -04:00
Android (Google) Code Review
c479198536
Merge change 9359
...
* changes:
Add several math functions to rsScript_Lib.
2009-07-31 11:49:32 -07:00
Romain Guy
8839ca5533
Add several math functions to rsScript_Lib.
2009-07-31 11:20:59 -07:00
Android (Google) Code Review
3e08aa68ea
Merge change 9354
...
* changes:
Handle SMS during CDMA emergency callback mode
2009-07-31 11:15:28 -07:00
Android (Google) Code Review
a45c5f07e2
Merge change 9216
...
* changes:
Fix UUID typo and allow incoming AVRCP connections.
2009-07-31 10:41:27 -07:00
Jaikumar Ganesh
ade40526c8
Fix UUID typo and allow incoming AVRCP connections.
2009-07-31 10:33:47 -07:00
Cary Clark
77d98f4ed7
rebuild the nav cache on mouse clicks during page load
...
On the first tap down, send a message to rebuild the nav
cache so that double taps have a better chance of having
some alignment information to work with.
Also, pass scale information to getBlockLeftEdge to
restrict the alignment search
2009-07-31 13:15:06 -04:00
Richard Meng
a1c94ae4f7
Handle SMS during CDMA emergency callback mode
...
If in emergency callback mode, any 3rd party application tries
to send Message using telephony API, return a NO_SERVICE error code.
2009-07-31 09:31:26 -07:00
Android (Google) Code Review
1b0efec347
am 17c195c8: Merge change 9340 into donut
...
Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'
* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
Fix issue 2025872: Deadlock in SoundPool.stop
2009-07-31 08:55:51 -07:00