Commit Graph

10779 Commits

Author SHA1 Message Date
Jason Sams
e5af55a84f am 12751251: am d8f7a0e3: Merge change I7299c83b into eclair
Merge commit '12751251cfdccb307117ae87543db6959f7807c7' into eclair-mr2-plus-aosp

* commit '12751251cfdccb307117ae87543db6959f7807c7':
  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:44:16 -07:00
Jason Sams
12751251cf 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
d8f7a0e3de 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
Jason Sams
7299c83bd8 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 14:55:41 -07:00
Mathias Agopian
1ed0e43dac am 93942a5b: am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7' into eclair-mr2-plus-aosp

* commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:44:23 -07:00
Mathias Agopian
453b5ba21f am fe50b63f: am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe' into eclair-mr2-plus-aosp

* commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe':
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 14:44:14 -07:00
Scott Main
0712f24dbf am a486f554: am 7f66dbce: Merge change Ic37381fb into eclair
Merge commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f' into eclair-mr2-plus-aosp

* commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f':
  docs: fix doc error in dialog example snippet
2009-10-16 14:44:05 -07:00
Mathias Agopian
93942a5bbc 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
fe50b63f9b 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
a486f554aa 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
69fba87ac1 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
7bb7e99216 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
7f66dbcec3 Merge change Ic37381fb into eclair
* changes:
  docs: fix doc error in dialog example snippet
2009-10-16 17:23:11 -04:00
Scott Main
c37381fbee docs: fix doc error in dialog example snippet
bug: 2160782
2009-10-16 14:08:37 -07:00
Andreas Huber
4b9dbdfa18 am d96f6e85: Merge change I8176f35e into eclair-mr2
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp

* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
  Reimplement the OMX backend for stagefright.
2009-10-16 12:51:42 -07:00
Suchi Amalapurapu
d27d445af8 am db966504: am c75348a9: (-s ours) Merge change Ib897cff1 into eclair
Merge commit 'db966504a744bd50e57f6f6e5c88131739be0152' into eclair-mr2-plus-aosp

* commit 'db966504a744bd50e57f6f6e5c88131739be0152':
  do not merge
2009-10-16 12:51:33 -07:00
Android (Google) Code Review
d96f6e8593 Merge change I8176f35e into eclair-mr2
* changes:
  Reimplement the OMX backend for stagefright.
2009-10-16 15:48:33 -04:00
Suchi Amalapurapu
db966504a7 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
c75348a938 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
Fred Quintana
fbbe2cd28a am 055e4ea5: Merge change Ief544bc6 into eclair-mr2
Merge commit '055e4ea56c42e714dc471d86311f64437f4ed786' into eclair-mr2-plus-aosp

* commit '055e4ea56c42e714dc471d86311f64437f4ed786':
  fix grammar in the grant permissions UI
2009-10-16 11:26:20 -07:00
Andreas Huber
784202ea11 Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
2009-10-16 11:22:43 -07:00
Android (Google) Code Review
055e4ea56c Merge change Ief544bc6 into eclair-mr2
* changes:
  fix grammar in the grant permissions UI
2009-10-16 14:16:13 -04:00
Mike Lockwood
d376366f13 am 08bb61a5: am 0b08abe1: Merge change I9521cf8b into eclair
Merge commit '08bb61a5290e37103ef74a8b08ac8adab8aba9f7' into eclair-mr2-plus-aosp

* commit '08bb61a5290e37103ef74a8b08ac8adab8aba9f7':
  Register for light sensor events if non-hardware based auto-brightnees is enabled
2009-10-16 09:48:43 -07:00
Mike Lockwood
5e6aa492b7 am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b' into eclair-mr2-plus-aosp

* commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:48:30 -07:00
Cary Clark
f846a0b57e am d21b7256: am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passion
Merge commit 'd21b725627e68b8ffcae38729196e8c1bd5d0d15' into eclair-mr2-plus-aosp

* commit 'd21b725627e68b8ffcae38729196e8c1bd5d0d15':
  do not merge: fix copy/paste using trackball on passion
2009-10-16 09:48:20 -07:00
Mike Lockwood
08bb61a529 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
2086152c1b 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
0b08abe1b8 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
f55aa972f9 Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Mike Lockwood
8738e0c040 Register for light sensor events if non-hardware based auto-brightnees is enabled
Change-Id: I9521cf8b315306bdafa70c1500f2e4af83d94ec3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-16 08:40:23 -07:00
Mike Lockwood
dc3494e3d8 Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-16 07:42:26 -07:00
Cary Clark
d21b725627 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
Cary Clark
39e6773431 do not merge: fix copy/paste using trackball on passion
This fix is alrady in mr2. It does not affect sholes --
this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-16 09:27:47 -04:00
Patrick Scott
93968f43af am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12' into eclair-mr2-plus-aosp

* commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:31:59 -07:00
Patrick Scott
e1f43dadb9 Share chunks between all ByteArrayBuilders.
If a single ByteArrayBuilder accumulates many chunks, it is possible that many
of those chunks will not be reused and will just take up memory in the pool. If
the pool is shared across all instances, fewer chunks need to be allocated. This
allows a site like http://www.606studios.com/bendisboard/showthread.php?t=170286
to load without crashing due to OOM.

The shared pool contains SoftReferences to each chunk. If the vm feels memory
pressure, it is allowed to mark these references for collection. Before
accessing the pool of chunks, I remove any queued references from the pool.

Cleanup ByteArrayBuilder a little by removing unused methods and fields.
Document some synchronization spots in LoadListener and add a lock when
downloading a certificate.

Bug: 1637965
2009-10-16 08:07:29 -04:00
Dave Sparks
671d6d8b9e am 2d3168dc: am b9a22122: Merge change I0e09e56f into eclair
Merge commit '2d3168dc29205e73063a596a28c99ed68e815dc4' into eclair-mr2-plus-aosp

* commit '2d3168dc29205e73063a596a28c99ed68e815dc4':
  Don't callback on NULL client. Bug 2180510.
2009-10-15 22:30:53 -07:00
Joe Onorato
3f48c07c16 am 2b7e284d: am 034cd0be: Merge change I486fdb55 into eclair
Merge commit '2b7e284dc140f904f6cea95a6b2c4b8fc6749214' into eclair-mr2-plus-aosp

* commit '2b7e284dc140f904f6cea95a6b2c4b8fc6749214':
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
2009-10-15 22:30:45 -07:00
Dave Sparks
2d3168dc29 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
b9a22122b0 Merge change I0e09e56f into eclair
* changes:
  Don't callback on NULL client. Bug 2180510.
2009-10-16 01:19:10 -04:00
Joe Onorato
2b7e284dc1 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
034cd0be57 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
Joe Onorato
486fdb5596 Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
This thing needs to be rewritten.  It's grown too complicated for what it's doing,
and I don't like the physics anyway.

Also, this leaves the bug where if you press back while it's animating down, the
animation is ignored.  However it no longer jumps down all the way, it just
essentially ignores the back key.

Also, this makes the collapse get executed on the back key up event, so it works
with the swipe on the soft keys at the bottom of the screen.
2009-10-15 20:31:33 -07:00
Suchi Amalapurapu
b897cff1ef 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-15 20:20:00 -07:00
Jason Sams
3979de01a6 am 6c502d0b: am 4f1d7656: Merge change I741a6100 into eclair
Merge commit '6c502d0b2ab2605b96cf1e677746fa7a53cda28b' into eclair-mr2-plus-aosp

* commit '6c502d0b2ab2605b96cf1e677746fa7a53cda28b':
  Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
2009-10-15 19:14:40 -07:00
Mike Lockwood
8ab456b3fc am df284aa5: am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit 'df284aa534bd5611684604c469c04b4db6bb42c7' into eclair-mr2-plus-aosp

* commit 'df284aa534bd5611684604c469c04b4db6bb42c7':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:14:32 -07:00
Jason Sams
ba5c6ae8ae am 193c985e: 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 '193c985e4458323e11db2671717a7087ae4cc5f3' into eclair-mr2-plus-aosp

* commit '193c985e4458323e11db2671717a7087ae4cc5f3':
  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:14:23 -07:00
Jason Sams
af4e786ab3 am 8dab9693: am c7412b3b: Minor bug fixes and add glError check.
Merge commit '8dab969302f2229397024bdaa005b35f30a46c62' into eclair-mr2-plus-aosp

* commit '8dab969302f2229397024bdaa005b35f30a46c62':
  Minor bug fixes and add glError check.
2009-10-15 19:14:15 -07:00
Jason Sams
1fab3e7981 am 8111da3e: am 6a17e163: Add egl init start message to help debug driver init hangs.
Merge commit '8111da3ecff116f26b49e9fc332c74a9ce14896c' into eclair-mr2-plus-aosp

* commit '8111da3ecff116f26b49e9fc332c74a9ce14896c':
  Add egl init start message to help debug driver init hangs.
2009-10-15 19:14:07 -07:00
jsh
cd1b991252 am 13982956: am 2a39758e: Merge change I51d41230 into eclair
Merge commit '1398295617457666bff877887b19ade105b83b82' into eclair-mr2-plus-aosp

* commit '1398295617457666bff877887b19ade105b83b82':
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 19:13:59 -07:00
Romain Guy
49f8a0ee91 am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp

* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:13:51 -07:00