9077 Commits

Author SHA1 Message Date
Mathias Agopian
7c64a89b3c am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser
2009-10-04 15:21:34 -07:00
Jason Sams
b3ac54771e am 8df16d63: Merge change I7f047786 into eclair
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2

* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-04 15:21:04 -07:00
Dmitri Plotnikov
022d0b6ede am 82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-mr2

* commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-04 15:20:26 -07:00
Android (Google) Code Review
cbc52b7bcb Merge change Iee638412 into eclair
* changes:
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-04 18:19:29 -04:00
San Mehat
21ee78b372 am 7b16834a: Merge change Iaf686344 into eclair
Merge commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-mr2

* commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
  dumpstate: Display mtime instead of ctime
2009-10-04 15:19:27 -07:00
Wei Huang
0200394a0d am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2

* commit '6b3707452c5921c89258371eec140b0fb76766f8':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-04 15:19:08 -07:00
Mike Cleron
cfc81aea5d am df64cb41: Merge change I80ce8833 into eclair
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-mr2

* commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4':
  Icons again
2009-10-04 15:17:27 -07:00
David Brown
fdc8c7826a am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-04 15:17:18 -07:00
Eric Fischer
0363f94e1a am 3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2

* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
  Import revised translations.  DO NOT MERGE
2009-10-04 15:16:07 -07:00
Jaikumar Ganesh
f2b80d8ccc am d453fe67: Merge change I5dbd1994 into eclair
Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2

* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
  Fix rfcomm socket connect return code.
2009-10-04 15:14:55 -07:00
Mathias Agopian
c5b09d8a5f am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
2009-10-04 15:14:32 -07:00
Joe Onorato
e0848c0fc4 am d14cfc27: Merge change I9e384ddd into eclair
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2

* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
  Add a test pattern as rollo's icon
2009-10-04 15:14:08 -07:00
John Wang
dcd1fe5fc8 am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2

* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
  Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-04 15:13:58 -07:00
Scott Main
87d5004d3b am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair

* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
  decode the search string before putting it into the search control.
2009-10-04 15:05:43 -07:00
Dianne Hackborn
bd0a81ff1c Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Mike Lockwood
2ecf3f5e00 dumpstate: Add backlight information to bugreport output.
To help diagnose bugs b/2164183 and b/2164647

Change-Id: Ie80c3b205c231c485d8a24e68b0a9c5e025da479
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-04 17:21:05 -04:00
Android (Google) Code Review
f8e4bc9f77 Merge change I0c4cec7e into eclair
* changes:
  Attempt to fix [2152536] ANR in browser
2009-10-02 23:35:12 -04:00
Android (Google) Code Review
8df16d63d4 Merge change I7f047786 into eclair
* changes:
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-02 21:40:07 -04:00
Jason Sams
7f047786d9 Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion. 2009-10-02 18:18:35 -07:00
Mathias Agopian
0c4cec7e4d Attempt to fix [2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.

This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.

Additionaly added more information in the logs, should this happen again.
2009-10-02 18:12:30 -07:00
Android (Google) Code Review
82e863d8ab Merge change Ic0d82ef1 into eclair
* changes:
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-02 19:17:30 -04:00
Dmitri Plotnikov
067ca26c02 [Issue 2161366] Changing capitalization of string "Via" to "via"
Approved by Tim.

Change-Id: Ic0d82ef1c687ecce91edc90a16aeefa17292d565
2009-10-02 16:06:14 -07:00
Android (Google) Code Review
7d63829296 Merge change Ib4285d22 into eclair-mr2
* changes:
  Change way we choose EGL surfaces to be compatible with the native window surface.
2009-10-02 17:49:59 -04:00
Jack Palevich
b4285d222a Change way we choose EGL surfaces to be compatible with the native
window surface.
2009-10-02 14:43:51 -07:00
Android (Google) Code Review
fde23e398e Merge change Ic66f68a7 into eclair-mr2
* changes:
  Fix a null pointer exception caught by the monkey.
2009-10-02 16:35:51 -04:00
Android (Google) Code Review
7b16834adc Merge change Iaf686344 into eclair
* changes:
  dumpstate: Display mtime instead of ctime
2009-10-02 16:34:02 -04:00
Android (Google) Code Review
9eca703d08 Merge change I499a9541 into eclair-mr2
* changes:
  setupRedirect() can throw. Catch it and signal the error.
2009-10-02 16:28:11 -04:00
San Mehat
af6863447c dumpstate: Display mtime instead of ctime
Signed-off-by: San Mehat <san@google.com>
2009-10-02 13:15:53 -07:00
Dianne Hackborn
4949334d20 Fix issue #2161726: Car dock app bypasses setup wizard
We now just don't send out dock broadcasts/launches when the
device is not provisioned.  Good enough for our purposes.

Change-Id: Iee6384121675e0e9854745ec1168245e8a23a241
2009-10-02 12:38:34 -07:00
Leon Scroggins
c66f68a787 Fix a null pointer exception caught by the monkey.
Fix http://b/issue?id=2162334
2009-10-02 15:17:31 -04:00
Grace Kloba
499a954182 setupRedirect() can throw. Catch it and signal the error.
Fix http://b/issue?id=2163139
2009-10-02 12:17:25 -07:00
Wei Huang
6b3707452c bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Change-Id: I1453950e406f1991e78530795ed28e6b4a7cf8c6
2009-10-02 11:52:40 -07:00
Patrick Scott
86806ce11a Process synchronous requests in the same RequestQueue.
Use a dedicated Connection to process a synchronous request using the main
RequestQueue and on the WebCore thread.

HttpConnection, HttpsConnection, Connection:
    No need for ConnectionManager, just pass the proxy host to
    HttpsConnection. In Connection.clearPipe, empty should be set to true if the
    RequestFeeder does _not_ have a request for the host. I don't think that
    broke anything but it is incorrect.
ConnectionThread:
    Refactor the proxy selection into ConnectionManager.getConnection
RequestHandle:
    Add a new constructor that takes a Connection argument. Add processRequest
    to process a single request on that Connection.
RequestQueue:
    Add determine host to select between the request's host and the proxy. Add
    queueSynchronousRequest to make a new request that operates on a private
    connection. Add SyncFeeder to handle RequestFeeder.requeueRequest if the
    request fails.
Network: Use the new RequestQueue api to handle a synchronous request.

Bug: 1315832
2009-10-02 14:51:55 -04:00
Android (Google) Code Review
df64cb41fb Merge change I80ce8833 into eclair
* changes:
  Icons again
2009-10-02 03:51:19 -04:00
David Brown
88e037577f RotarySelector widget: add callback for "grabbed" state changes.
This is the frameworks/base part of the fix for Bug 2158434: add a new
callback to the OnDialTriggerListener interface, so the RotarySelector can
tell the app about state changes between NOTHING_GRABBED and
LEFT_HANDLE_GRABBED and RIGHT_HANDLE_GRABBED.

BUG=2158434
DRNO=timsullivan

TESTED=regular incoming calls, call waiting calls, answering a call,
       rejecting a call.  Also verified I didn't affect the
       lock screen at all.
2009-10-02 00:30:08 -07:00
Mike Cleron
80ce883347 Icons again 2009-10-02 00:27:31 -07:00
Android (Google) Code Review
3d7bb3a5e4 Merge change I3ca8fb69 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-02 00:47:08 -04:00
Android (Google) Code Review
d453fe6709 Merge change I5dbd1994 into eclair
* changes:
  Fix rfcomm socket connect return code.
2009-10-01 22:46:23 -04:00
Jaikumar Ganesh
a01a4479a1 Fix rfcomm socket connect return code.
The phone would say connected even when powered off.
Bug id: 2161890
DrNo: Hiroshi

Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
2009-10-01 19:12:18 -07:00
Android (Google) Code Review
4ac45597fb Merge change I15b0ebb9 into eclair
* changes:
  a simple test app for gralloc
2009-10-01 20:25:45 -04:00
Mathias Agopian
15b0ebb925 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Eric Fischer
4898829b45 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 16:59:07 -07:00
Android (Google) Code Review
d14cfc2762 Merge change I9e384ddd into eclair
* changes:
  Add a test pattern as rollo's icon
2009-10-01 19:49:27 -04:00
Joe Onorato
9e384dddb8 Add a test pattern as rollo's icon 2009-10-01 16:48:44 -07:00
Romain Guy
18d1255ebe Prevents memory leaks by correctly detaching views in AbsListView.
AbsListView can reject views from the recycler's scrap heap but when that
happens the rejected view is not detached from the parent. This can be pretty
bad in the case of TextView since it prevents them from unregistering their
OnPreDrawListeners.
2009-10-01 15:39:42 -07:00
Scott Main
e9e1cdd556 decode the search string before putting it into the search control.
this fixes a safari-only bug in which encoded chars were inserted
into the search string.

http://b/issue?id=2031559

Change-Id: Ie60902bafcbb327d488b921f8d3925aaf9ff0566
2009-10-01 15:20:35 -07:00
John Wang
99510681e9 Unhide constant DATA_ACTIVITY_DORMANT. 2009-10-01 10:00:54 -07:00
android-build SharedAccount
7f86d58f17 Merge commit 'goog/eclair' into eclair-release 2009-10-01 08:43:40 -07:00
Marco Nelissen
9b150b7457 Close the cursor before assigning a new one to the same variable. 2009-10-01 08:16:02 -07:00
Android (Google) Code Review
87b94b13ea Merge change I6e01fa52 into eclair
* changes:
  Remove unneeded icon.
2009-10-01 11:01:34 -04:00