Commit Graph

6406 Commits

Author SHA1 Message Date
Jason Sams
a0fbb5f2b0 am 6a17e163: Add egl init start message to help debug driver init hangs.
Merge commit '6a17e163a0dca28c1b2f957561e909172b7259c8' into eclair-plus-aosp

* commit '6a17e163a0dca28c1b2f957561e909172b7259c8':
  Add egl init start message to help debug driver init hangs.
2009-10-15 16:17:30 -07:00
jsh
1fca840c73 am 2a39758e: Merge change I51d41230 into eclair
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-plus-aosp

* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 15:56:43 -07:00
Android (Google) Code Review
cc4366deb8 Merge change I51d41230 into eclair
* changes:
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 18:49:44 -04:00
Romain Guy
cef1e9b9fb am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-plus-aosp

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:04 -07:00
Android (Google) Code Review
156a67e55e Merge change I0d74deb6 into eclair
* changes:
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 18:33:12 -04:00
Dave Sparks
393eb7967f Don't callback on NULL client. Bug 2180510.
We weren't checking to see if there was a valid camera client when
calling the notify callback function. Now we grab a strong pointer
before the callback to guarantee that the client is not destroyed
before we complete the callback. This change also fixes other
places in the code where we weren't holding a local strong pointer.
2009-10-15 15:18:08 -07:00
Guang Zhu
c23269e19a am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-plus-aosp

* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
  Enable some tests that requires local http server
2009-10-15 12:01:44 -07:00
Scott Main
c696b326d4 am 30a6657e: Merge change Ic9b31801 into eclair
Merge commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4' into eclair-plus-aosp

* commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4':
  docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
2009-10-14 18:01:59 -07:00
Android (Google) Code Review
39c999a537 Merge change Ic9b31801 into eclair
* changes:
  docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0... move upgrading doc into a new guide for "updating" with the new manager tools and remove the previous updating doc from the dev guide. set up preliminary download page and guide for installing the full SDK. add the requirements doc in sdk/ for all general purposes. revise the download 'thank you' message.
2009-10-14 20:52:50 -04:00
Nick Pelly
aa72238b7c am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-plus-aosp

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:02 -07:00
Jean-Baptiste Queru
3801d32d8c merge from open-source master 2009-10-14 12:26:31 -07:00
Nick Pelly
059490a49b am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-plus-aosp

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:58 -07:00
Android (Google) Code Review
f7f46955f7 Merge change I2492bffe into eclair
* changes:
  Remove STOPSHIP comment.
2009-10-14 14:55:44 -04:00
Katarina Stenstedt
5d58d4de74 am 399fc263: Merge change If30c5e20 into eclair
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-plus-aosp

* commit '399fc2636f1332986f319df3cf8ae56344070c51':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:08:42 -07:00
Android (Google) Code Review
bf89a25446 Merge change If30c5e20 into eclair
* changes:
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial. Changed image links to use @docRoot.
2009-10-14 12:52:00 -04:00
Mathias Agopian
618fa10949 fix [2187212] add support for GLESv2 dispatch based on TLS
Instead of using a different function pointer table for ES 1.x and ES 2.x,
we use a single one that is the union (sort|uniq) of both tables. Two
instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x
entry-points.
When a context is created, we store its version number and when it is bound to a
thread we set the approruiate table based on the stored version.

This introduce no penalty while dispatching gl calls to the right API version.

[Pending Dr No approval for MR1]
2009-10-14 02:06:37 -07:00
Dmitri Plotnikov
98cb8888a4 am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-plus-aosp

* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 00:47:52 -07:00
Dave Sparks
c788a3feda am 8c471d1d: Merge change I4ef3e82f into eclair
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-plus-aosp

* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
  7 more ringtones. Now with more Dr. No!
2009-10-14 00:20:57 -07:00
Android (Google) Code Review
90e1850c05 Merge change I4ef3e82f into eclair
* changes:
  7 more ringtones. Now with more Dr. No!
2009-10-14 03:13:12 -04:00
Dianne Hackborn
0f23db6326 am cbf77e9b: Merge change I875200fe into eclair
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-plus-aosp

* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-13 23:00:28 -07:00
Android (Google) Code Review
d6e991e167 Merge change I875200fe into eclair
* changes:
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-14 01:51:00 -04:00
Dianne Hackborn
bd2a87b004 am b10e2f1a: Merge change Iac534225 into eclair
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 20:21:11 -07:00
Android (Google) Code Review
f1e8da6637 Merge change Iac534225 into eclair
* changes:
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 23:13:37 -04:00
Dmitri Plotnikov
80b06559bc am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:56 -07:00
Jean-Baptiste Queru
5e7b59f81c Merge from donut 2009-10-13 18:07:12 -07:00
Jeff Sharkey
be7c71921f am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-plus-aosp

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Robert Greenwalt
6443ff30bf am 64d54042: Merge change I61c08260 into eclair
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-plus-aosp

* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
  Futher reduce the logging of EriManager.
2009-10-13 14:12:03 -07:00
Android (Google) Code Review
7f2eeca5ba Merge change I61c08260 into eclair
* changes:
  Futher reduce the logging of EriManager.
2009-10-13 17:07:10 -04:00
Dianne Hackborn
358dd36e85 am 2a21a77d: Merge change I1369e9ab into eclair
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-plus-aosp

* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 11:52:58 -07:00
Android (Google) Code Review
8ace1a7d11 Merge change I1369e9ab into eclair
* changes:
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 14:45:56 -04:00
Robert Greenwalt
0646d0cfd8 am 16cb04ab: Merge change If1acb2dd into eclair
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-plus-aosp

* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
  Add a little logging to diagnose wifi cycle bug
2009-10-13 09:54:36 -07:00
Android (Google) Code Review
676a3f3ca4 Merge change If1acb2dd into eclair
* changes:
  Add a little logging to diagnose wifi cycle bug
2009-10-13 12:45:30 -04:00
Dave Sparks
62cb5fdf8e am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-plus-aosp

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 03:11:09 -07:00
Android (Google) Code Review
f4fc80918c Merge change I9f93ce61 into eclair
* changes:
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 06:02:59 -04:00
Grace Kloba
019e95bd90 am 2e778c17: Merge change I124356f6 into eclair
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-plus-aosp

* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
  Continue caching "POST" result so that we won't get
2009-10-12 18:36:18 -07:00
Android (Google) Code Review
295b1d2c74 Merge change I124356f6 into eclair
* changes:
  Continue caching "POST" result so that we won't get the resubmission warning when back to Google search result.
2009-10-12 21:30:04 -04:00
Libin Tang
bd43601ad5 am febb94cd: Make standard roaming indicator display indications configurable
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-plus-aosp

* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
  Make standard roaming indicator display indications configurable
2009-10-12 14:23:43 -07:00
Robert Greenwalt
496f5a6a3f am 6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-plus-aosp

* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
  Reduce the amount of EriManager Logging.
2009-10-12 12:33:36 -07:00
Android (Google) Code Review
90ba1f8aed Merge change I71f48a21 into eclair
* changes:
  Reduce the amount of EriManager Logging.
2009-10-12 15:25:51 -04:00
Dima Zavin
b8325edebf am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-plus-aosp

* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:08:10 -07:00
Android (Google) Code Review
c811a2e0c9 Merge change I6261ab54 into eclair
* changes:
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 15:01:43 -04:00
Mike Lockwood
5e76df22db am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-plus-aosp

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:21:54 -07:00
Android (Google) Code Review
beb1f98afb Merge change Iad66a274 into eclair
* changes:
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 14:14:44 -04:00
Nick Pelly
3b9db0b985 am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-plus-aosp

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:12:02 -07:00
Dianne Hackborn
8065aef46d am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-plus-aosp

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:50 -07:00
Android (Google) Code Review
b511d372c6 Merge change I305c181c into eclair
* changes:
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 14:05:44 -04:00
Android (Google) Code Review
71df04a877 Merge change I067d55ea into eclair
* changes:
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 14:04:31 -04:00
Jeff Hamilton
8a31880e43 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-plus-aosp

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:26:43 -07:00
Fred Quintana
e4c5b37851 am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-plus-aosp

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:40 -07:00
Android (Google) Code Review
3b3b62cba2 Merge change I66693ea2 into eclair
* changes:
  fix sync exponential backoff for expedited syncs
2009-10-10 00:10:29 -04:00