Commit Graph

5113 Commits

Author SHA1 Message Date
Android (Google) Code Review
1297164a35 Merge change I28023911 into eclair-mr2
* changes:
  Add additional error checking of EGL function calls.
2009-10-13 22:54:15 -04:00
Dmitri Plotnikov
93331c3d22 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:40 -07:00
Android (Google) Code Review
66bde586fb Merge change Ic52ba78c into eclair-mr2
* changes:
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 21:08:17 -04:00
Jeff Sharkey
b32cc07b61 am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Android (Google) Code Review
c63bdd1ebd Merge change I4410ec8f into eclair-mr2
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
2009-10-13 21:01:26 -04:00
Android (Google) Code Review
dea428b4e0 Merge change I69e21f5f into eclair-mr2
* changes:
  GLDual test application.
2009-10-13 17:57:50 -04:00
Jack Palevich
9bd30f05e8 GLDual test application.
Draws two images at once, one GL based, one GL2 based.
2009-10-13 14:56:00 -07:00
Android (Google) Code Review
b8bb011df8 Merge change I7fa8c508 into eclair-mr2
* changes:
  make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
Robert Greenwalt
5e657ee86b am 64d54042: Merge change I61c08260 into eclair
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2

* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
  Futher reduce the logging of EriManager.
2009-10-13 14:11:54 -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
Android (Google) Code Review
8716c13580 Merge change I564b5b00 into eclair-mr2
* changes:
  add "junk path" -k option to aapt
2009-10-13 16:41:21 -04:00
Android (Google) Code Review
08f79ebf90 Merge change Iaa321588 into eclair-mr2
* changes:
  Add "deleted" row to Events table.
2009-10-13 16:10:32 -04:00
Android (Google) Code Review
c85ae90db0 Merge change Id5ba82a1 into eclair-mr2
* changes:
  Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04:00
Dianne Hackborn
bd351e8bfd am 2a21a77d: Merge change I1369e9ab into eclair
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2

* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 11:52:34 -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
Android (Google) Code Review
fd5d36bb78 Merge change I3dafca18 into eclair-mr2
* changes:
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Android (Google) Code Review
d84946c273 Merge change I73b00501 into eclair-mr2
* changes:
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Android (Google) Code Review
ebd103486b Merge change Ibd7b43bb into eclair-mr2
* changes:
  Separated private from public header files.
2009-10-13 13:38:28 -04:00
Android (Google) Code Review
1e3945aca8 Merge change I8d87cd98 into eclair-mr2
* changes:
  Fix various compiler warnings accumulated over time.
2009-10-13 13:31:58 -04:00
Robert Greenwalt
fa9a2ee309 am 16cb04ab: Merge change If1acb2dd into eclair
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2

* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
  Add a little logging to diagnose wifi cycle bug
2009-10-13 09:56:40 -07:00
Dave Sparks
2073967d00 am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -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
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
7d8784664b am 2e778c17: Merge change I124356f6 into eclair
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2

* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
  Continue caching "POST" result so that we won't get
2009-10-12 18:36:17 -07:00
Android (Google) Code Review
7b70ca95c5 Merge change Ic6d1545d into eclair-mr2
* changes:
  Support double-quote SSID in WifiService.
2009-10-12 21:33:04 -04: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
Android (Google) Code Review
9fd2393c2b Merge change I98276091 into eclair-mr2
* changes:
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 19:01:28 -04:00
Android (Google) Code Review
be2b4a7b9d Merge change I83b3bddf into eclair-mr2
* changes:
  Add a new TestSuites: VCardTests
2009-10-12 17:44:19 -04:00
Libin Tang
c94b6e6818 am febb94cd: Make standard roaming indicator display indications configurable
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2

* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
  Make standard roaming indicator display indications configurable
2009-10-12 14:23:09 -07:00
Android (Google) Code Review
20cfad1335 Merge change I2a52a60a into eclair-mr2
* changes:
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 17:03:12 -04:00
Robert Greenwalt
79adadff83 am 6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2

* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
  Reduce the amount of EriManager Logging.
2009-10-12 12:33:42 -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
1533d8eabc am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2

* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:08:19 -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
Android (Google) Code Review
3aaa924bb8 Merge change Ifd71653f into eclair-mr2
* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00
Mike Lockwood
6d66522ea9 am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:21:28 -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
30d15f3e6d am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:11:38 -07:00
Dianne Hackborn
6342c58598 am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:30 -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
Android (Google) Code Review
faf907984d Merge change I4a4323c0 into eclair-mr2
* changes:
  Fixes scroll/measure bug in EditText
2009-10-12 13:31:19 -04:00
Android (Google) Code Review
6f31c11692 Merge change I409d9b4a into eclair-mr2
* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-10 16:28:58 -04:00
Jeff Hamilton
49c9a09c94 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:25:39 -07:00
Fred Quintana
57f753e79b am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-mr2

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:55 -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
Dima Zavin
4445712fd4 Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
This reverts commit ed5ecdba36648973be3033a045e2ece8bf039e4a.
2009-10-09 18:23:08 -07:00
Android (Google) Code Review
59e2184836 Merge change I85f598e0 into eclair-mr2
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-09 20:40:26 -04:00
Dianne Hackborn
b15cf5c7f6 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:38:59 -07:00
Romain Guy
c997b904c0 am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-mr2

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:27:35 -07:00