10315 Commits

Author SHA1 Message Date
Dianne Hackborn
0edc952e29 am 8c815d9d: am b134b203: Merge change Id8c9cb2f into eclair
Merge commit '8c815d9dedc89fcf94c07b03bdf8b3a8ea33e240' into eclair-mr2-plus-aosp

* commit '8c815d9dedc89fcf94c07b03bdf8b3a8ea33e240':
2009-10-07 22:13:29 -07:00
Dianne Hackborn
c7ed01f401 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 22:13:28 -07:00
Dianne Hackborn
3f4313667e am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:08:15 -07:00
Dianne Hackborn
8c815d9ded am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:07:54 -07:00
Android (Google) Code Review
b134b2038e Merge change Id8c9cb2f into eclair
* changes:
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-08 00:58:46 -04:00
Dianne Hackborn
3d163f073f More fix #2163209: alarm clock rings but is hidden behind lock screen
There was another way we could ignore the application windows flags
while the lock screen was displayed.  This is the infrastructure to
deal with that.

Change-Id: Id8c9cb2f7081df6757ccb797a7cde618e82f7b38
2009-10-07 21:26:57 -07:00
Dave Sparks
43fa4d920c am ec83852a: am 281acf42: Merge change I52479480 into eclair
Merge commit 'ec83852a19771948ed1b6dd3af56e8439b747bf8' into eclair-mr2-plus-aosp

* commit 'ec83852a19771948ed1b6dd3af56e8439b747bf8':
2009-10-07 21:19:35 -07:00
Jason Sams
a8203875ed am 48289b2e: am 7c12540f: Merge change Ibd2197fb into eclair
Merge commit '48289b2e892cf55bf4bdc6163f8f4f0642eed9b9' into eclair-mr2-plus-aosp

* commit '48289b2e892cf55bf4bdc6163f8f4f0642eed9b9':
2009-10-07 21:19:30 -07:00
Doug Zongker
40f888bf61 am 83b60080: am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '83b600803cdbcb3f9788845c77e5c1d17bc36dd5' into eclair-mr2-plus-aosp

* commit '83b600803cdbcb3f9788845c77e5c1d17bc36dd5':
2009-10-07 21:19:24 -07:00
Mathias Agopian
a6e567f59e am e726f6e9: am 4ff6d01d: Merge change I46b2df15 into eclair
Merge commit 'e726f6e998b7f42dcc41bd2154c5fb3ddf5a5838' into eclair-mr2-plus-aosp

* commit 'e726f6e998b7f42dcc41bd2154c5fb3ddf5a5838':
2009-10-07 21:19:19 -07:00
Mathias Agopian
620d24794c am 3145c43d: am c7141303: Merge change Id23b791a into eclair
Merge commit '3145c43df468a7fa17ca1959a3c2b8a610c69604' into eclair-mr2-plus-aosp

* commit '3145c43df468a7fa17ca1959a3c2b8a610c69604':
2009-10-07 21:19:13 -07:00
Grace Kloba
9136c39d49 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 21:19:12 -07:00
Dave Sparks
80491a7f39 am 281acf42: Merge change I52479480 into eclair
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-plus-aosp

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
2009-10-07 21:14:29 -07:00
Dave Sparks
ec83852a19 am 281acf42: Merge change I52479480 into eclair
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-mr2

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
2009-10-07 21:14:19 -07:00
Android (Google) Code Review
281acf421f Merge change I52479480 into eclair
* changes:
  Retry overlay create if it fails. Bug 2153980.
2009-10-08 00:07:05 -04:00
Dave Sparks
2133640028 Retry overlay create if it fails. Bug 2153980.
Occasionally we see references to the overlay hanging around long
enough to cause problems in applications when they tried to destroy
the overlay and re-create it. This patch causes the camera HAL to
retry the overlay creation call if it fails every 20ms up to 50
times before it gives up.
2009-10-07 19:22:02 -07:00
Jason Sams
48289b2e89 am 7c12540f: Merge change Ibd2197fb into eclair
Merge commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-mr2

* commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
2009-10-07 18:24:09 -07:00
Doug Zongker
83b600803c am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-mr2

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:24:03 -07:00
Jason Sams
7016fa322c am 7c12540f: Merge change Ibd2197fb into eclair
Merge commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-plus-aosp

* commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
2009-10-07 18:22:11 -07:00
Doug Zongker
3253b16a0d am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-plus-aosp

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:22:05 -07:00
Mathias Agopian
e726f6e998 am 4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-mr2

* commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 18:18:56 -07:00
Mathias Agopian
3145c43df4 am c7141303: Merge change Id23b791a into eclair
Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 18:18:50 -07:00
Android (Google) Code Review
7c12540f09 Merge change Ibd2197fb into eclair
* changes:
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
2009-10-07 21:18:01 -04:00
Mathias Agopian
ca53133f84 am 4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-plus-aosp

* commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 18:17:15 -07:00
Mathias Agopian
c48f48c86f am c7141303: Merge change Id23b791a into eclair
Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-plus-aosp

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 18:17:09 -07:00
Doug Zongker
9af53ea6ef am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4' into eclair

* commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:17:06 -07:00
Jason Sams
bd2197fb00 Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder. 2009-10-07 18:14:01 -07:00
Android (Google) Code Review
4ff6d01d42 Merge change I46b2df15 into eclair
* changes:
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 21:09:49 -04:00
Android (Google) Code Review
c71413032e Merge change Id23b791a into eclair
* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 21:07:05 -04:00
Grace Kloba
6764f2ca44 am a921bf4e: Merge change I8f5e405f into eclair-mr2
Merge commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33' into eclair-mr2-plus-aosp

* commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33':
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-07 18:06:27 -07:00
Mathias Agopian
0da41a3635 fix [2170283] SurfaceFlinger crashes on OOM.
when running out of memory, a null handle is returned but the error code may not be set.
In that case we need to return NO_MEMORY instead of NO_ERROR, so that the calling code
won't try to dereference the null pointer.
2009-10-07 18:03:35 -07:00
Android (Google) Code Review
a921bf4e9f Merge change I8f5e405f into eclair-mr2
* changes:
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-07 20:59:21 -04:00
Mathias Agopian
46b2df153f fix [2164183] sometimes device just wants to stay asleep
When switching rapidily orientation back and forth, surfaces end-up
acquiring the freeze-lock when the first orientation change happens,
but never release it because by the time the 2nd orientation change
comes in, the surface size is back to its original size and
doesn't appear to have resized.

we now always release the freeze-lock when we receive a buffer of the
expected size.
2009-10-07 17:58:29 -07:00
Dianne Hackborn
8221dc1d02 am d78fbddd: am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit 'd78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4' into eclair-mr2-plus-aosp

* commit 'd78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4':
2009-10-07 17:55:40 -07:00
Dianne Hackborn
fb256574b4 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 17:55:40 -07:00
Dianne Hackborn
d78fbdddea am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:14 -07:00
Dianne Hackborn
496b8c5d6b am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-plus-aosp

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:08 -07:00
Mathias Agopian
58226c4a76 am 18fc0120: am a2de8e31: Merge change Ie05f07df into eclair
Merge commit '18fc0120f59f179ab13adf9e122371f32f65a12c' into eclair-mr2-plus-aosp

* commit '18fc0120f59f179ab13adf9e122371f32f65a12c':
2009-10-07 17:39:12 -07:00
Mike Cleron
f9b8d3e103 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 17:39:12 -07:00
Dianne Hackborn
568cae571a Fix issue #2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
2009-10-07 17:37:16 -07:00
Mathias Agopian
848a42e371 am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-plus-aosp

* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 17:34:19 -07:00
Mathias Agopian
18fc0120f5 am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2

* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 17:33:43 -07:00
Android (Google) Code Review
a2de8e31c2 Merge change Ie05f07df into eclair
* changes:
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 20:25:08 -04:00
Doug Zongker
3161795b23 when logging free space on /data, log /system and /cache as well
Report space free on system and cache so we can estimate bad block
statistics for devices in the field.
2009-10-07 17:16:07 -07:00
Dmitri Plotnikov
48b0f0d8c0 am c38f6f33: am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c38f6f33011e5b3b2f947bf94d8b96b97e67128c' into eclair-mr2-plus-aosp

* commit 'c38f6f33011e5b3b2f947bf94d8b96b97e67128c':
2009-10-07 17:12:54 -07:00
Evan Millar
1fe17c5f2f Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 17:12:54 -07:00
Dmitri Plotnikov
56bebbba89 am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-plus-aosp

* commit 'c15934f26a235a8218f9f673ebf8227acccefff2':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 17:07:56 -07:00
Dmitri Plotnikov
c38f6f3301 am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-mr2

* commit 'c15934f26a235a8218f9f673ebf8227acccefff2':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 17:07:26 -07:00
Android (Google) Code Review
c15934f26a Merge change I7a57637b into eclair
* changes:
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 19:59:07 -04:00
Mathias Agopian
e05f07dffa fix [2170319] gmail bulk operation checkbox latency on passion
This also fixes [2152536] ANR in browser

When SF is enqueuing buffers faster than SF dequeues them.
The update flag in SF is not counted and under some situations SF will only
dequeue the first buffer. The state at this point is not technically
corrupted, it's valid, but just delayed by one buffer.

In the case of the Browser ANR, because the last enqueued buffer was delayed
the resizing of the current buffer couldn't happen.

The system would always fall back onto its feet if anything -else- in
tried to draw, because the "late" buffer would be picked up then.
2009-10-07 16:44:10 -07:00