Commit Graph

5336 Commits

Author SHA1 Message Date
Android (Google) Code Review
5add0f7289 Merge change I4458a55d into eclair-mr2
* changes:
  Add access to ContentProvider for SyncState.
2009-10-19 16:52:14 -04:00
Android (Google) Code Review
3af19ae9bf Merge change Ia245b1c4 into eclair-mr2
* changes:
  Add a string for upload file button.
2009-10-19 16:39:35 -04:00
Android (Google) Code Review
ff5a193a64 Merge change Ib1678609 into eclair-mr2
* changes:
  Avoid signaling a format change to the client if its insubstantial.
2009-10-19 16:15:30 -04:00
Dianne Hackborn
e67527165a am 007a429f: Update 5.xml with last minute changes.
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2

* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
  Update 5.xml with last minute changes.
2009-10-19 13:03:52 -07:00
Android (Google) Code Review
7fd3ef6a9e Merge change I63d524fd into eclair-mr2
* changes:
  Fixing the build by renaming private "string.h" header file.
2009-10-19 13:20:05 -04:00
Android (Google) Code Review
bdd4b61e2c Merge change I44bbc36d into eclair-mr2
* changes:
  Add htm and html extensions to the map as "text/html"
2009-10-17 12:20:42 -04:00
Mathias Agopian
6dbedd7519 one step towards fixing [2071412] work around mdp 32-bits fade limitation
simplify the GL_MODULATE case and allow blending disabled with RGBA texture
2009-10-16 18:24:12 -07:00
Scott Main
cf256a5354 am 445c05c4: am f3bc5349: docs: fix doc error in dialog example snippet (no not merge)
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-mr2

* commit '445c05c4849c960bb43f73a0390e62dc73991da6':
  docs: fix doc error in dialog example snippet (no not merge)
2009-10-16 18:03:08 -07:00
Scott Main
7846561bd6 am f3bc5349: docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f' into eclair

* commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f':
  docs: fix doc error in dialog example snippet (no not merge)
2009-10-16 17:52:15 -07:00
Andreas Huber
7a9b05fada resolved conflicts for merge of f585be7f to eclair-mr2 2009-10-16 15:32:50 -07:00
Yu Shan Emily Lau
bdcb5e6e4c am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:21:22 -07:00
Jason Sams
48bfd9c334 am d8f7a0e3: Merge change I7299c83b into eclair
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-mr2

* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
2009-10-16 15:17:25 -07:00
Android (Google) Code Review
8fe00cfcee Merge change I11ebbfd9 into eclair
* changes:
  A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
2009-10-16 18:13:19 -04:00
Android (Google) Code Review
997d737bbb Merge change Idcaa1ef8 into eclair
* changes:
  1) Add 10 seconds wait time before collecting the end memory. 2) Modified the player stress test, shorten the plabyack time.
2009-10-16 18:06:43 -04:00
Android (Google) Code Review
7ee5449954 Merge change I7299c83b into eclair
* changes:
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
2009-10-16 17:56:29 -04:00
Mathias Agopian
537728fcd3 am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-mr2

* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:33:10 -07:00
Mathias Agopian
6751c84d4d am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2

* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 14:33:01 -07:00
Scott Main
2e9ff66ee2 am 7f66dbce: Merge change Ic37381fb into eclair
Merge commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9' into eclair-mr2

* commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9':
  docs: fix doc error in dialog example snippet
2009-10-16 14:32:48 -07:00
Android (Google) Code Review
031a1dc6d8 Merge change I6fc56997 into eclair
* changes:
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 17:26:55 -04:00
Android (Google) Code Review
76f95d0caf Merge change Ia8ac904d into eclair
* changes:
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 17:26:15 -04:00
Android (Google) Code Review
8a601f3795 Merge change Ic37381fb into eclair
* changes:
  docs: fix doc error in dialog example snippet
2009-10-16 17:23:11 -04:00
Android (Google) Code Review
fddcb2ddbd Merge change I8176f35e into eclair-mr2
* changes:
  Reimplement the OMX backend for stagefright.
2009-10-16 15:48:33 -04:00
Suchi Amalapurapu
8b45070b37 am c75348a9: (-s ours) Merge change Ib897cff1 into eclair
Merge commit 'c75348a9384a5310bb34bf02cafd0076630f4a28' into eclair-mr2

* commit 'c75348a9384a5310bb34bf02cafd0076630f4a28':
  do not merge
2009-10-16 12:46:25 -07:00
Android (Google) Code Review
e48d115ba2 Merge change Ib897cff1 into eclair
* changes:
  do not merge Return valid package info for packages that have been uninstalled with an option to retain data and resources using the flag GET_UNINSTALLED_PACKAGES These packages do not have a package setting. just check the flag and return the required info from PackageParser.generatePackageInfo
2009-10-16 15:36:40 -04:00
Android (Google) Code Review
95cb8198df Merge change Ief544bc6 into eclair-mr2
* changes:
  fix grammar in the grant permissions UI
2009-10-16 14:16:13 -04:00
Mike Lockwood
6ce1cd7d5a am 0b08abe1: Merge change I9521cf8b into eclair
Merge commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a' into eclair-mr2

* commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a':
  Register for light sensor events if non-hardware based auto-brightnees is enabled
2009-10-16 09:38:12 -07:00
Mike Lockwood
f3ffe36d45 am f55aa972: Merge change I01935be3 into eclair
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-mr2

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:38:03 -07:00
Android (Google) Code Review
dfaab0d35b Merge change I9521cf8b into eclair
* changes:
  Register for light sensor events if non-hardware based auto-brightnees is enabled
2009-10-16 12:29:39 -04:00
Android (Google) Code Review
cc6581660f Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Cary Clark
8e95205da2 am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passion
Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-mr2

* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
  do not merge: fix copy/paste using trackball on passion
2009-10-16 07:12:54 -07:00
Dave Sparks
78a81db3d7 am b9a22122: Merge change I0e09e56f into eclair
Merge commit 'b9a22122b08d749368f90128e29aff035031f8db' into eclair-mr2

* commit 'b9a22122b08d749368f90128e29aff035031f8db':
  Don't callback on NULL client. Bug 2180510.
2009-10-15 22:24:45 -07:00
Android (Google) Code Review
3f205ecfac Merge change I0e09e56f into eclair
* changes:
  Don't callback on NULL client. Bug 2180510.
2009-10-16 01:19:10 -04:00
Joe Onorato
8995c00ad5 am 034cd0be: Merge change I486fdb55 into eclair
Merge commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772' into eclair-mr2

* commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772':
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
2009-10-15 20:39:51 -07:00
Android (Google) Code Review
2c037df204 Merge change I486fdb55 into eclair
* changes:
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
2009-10-15 23:32:39 -04:00
Jason Sams
9cd1544321 am 4f1d7656: Merge change I741a6100 into eclair
Merge commit '4f1d765699b1be320d49530313b750a4d153a0bb' into eclair-mr2

* commit '4f1d765699b1be320d49530313b750a4d153a0bb':
  Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
2009-10-15 19:07:06 -07:00
Mike Lockwood
230743795f am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-mr2

* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:06:52 -07:00
Jason Sams
ed9024d3ca am 41c19db9: Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code.
Merge commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d' into eclair-mr2

* commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d':
  Remove hack in RS that called exit to WAR now fixed driver bugs.  Make gloabal init safe by locking around the critical code.
2009-10-15 19:06:43 -07:00
Android (Google) Code Review
bff2e7d7f7 Merge change I741a6100 into eclair
* changes:
  Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
2009-10-15 21:47:03 -04:00
Mathias Agopian
38a7fa2ae3 fix [2182249] [MR1] valgrind error in surface flinger 2009-10-15 18:08:15 -07:00
Jason Sams
0d96d635a6 am c7412b3b: Minor bug fixes and add glError check.
Merge commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2' into eclair-mr2

* commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2':
  Minor bug fixes and add glError check.
2009-10-15 16:17:08 -07:00
Jason Sams
adbb36fb1f am 6a17e163: Add egl init start message to help debug driver init hangs.
Merge commit '6a17e163a0dca28c1b2f957561e909172b7259c8' into eclair-mr2

* commit '6a17e163a0dca28c1b2f957561e909172b7259c8':
  Add egl init start message to help debug driver init hangs.
2009-10-15 16:16:59 -07:00
jsh
be190fea56 am 2a39758e: Merge change I51d41230 into eclair
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-mr2

* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 15:57:28 -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
f01e6dbb02 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:05 -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
Android (Google) Code Review
d7053ee8a2 Merge change I7f97011b into eclair-mr2
* changes:
  check for native initialization before calling public function
2009-10-15 15:41:06 -04:00
Guang Zhu
f95802dd1b am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-mr2

* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
  Enable some tests that requires local http server
2009-10-15 11:59:05 -07:00
Android (Google) Code Review
9fdf27819d Merge change I1a23191b into eclair-mr2
* changes:
  fix build
2009-10-15 14:33:39 -04:00
Android (Google) Code Review
b1ba69cc4a Merge change I6719d39d into eclair-mr2
* changes:
  Fix alert dialog separator
2009-10-15 14:15:03 -04:00