30029 Commits

Author SHA1 Message Date
Kenny Root
2ec4af5920 am 138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Kenny Root
138757db4f Merge "Make OBB results a one-way call" into gingerbread 2011-01-26 09:17:28 -08:00
Kenny Root
b7db2726e9 Make OBB results a one-way call
OBB result back to an application needs to be a one-way binder call.

Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Jeff Hamilton
f0b7977f68 am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Jeff Hamilton
c33acae906 Merge "Fix the build, proper current.xml." into gingerbread 2011-01-25 16:11:37 -08:00
Jeff Hamilton
978afba57c Fix the build, proper current.xml.
Change-Id: I9b02206042c74fd5c329fe2b70ed2b6b91d41382
2011-01-25 18:10:58 -06:00
Brad Fitzpatrick
6af61b8435 am a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
  android.os.Message: respect sPoolSize
2011-01-25 15:44:33 -08:00
Brad Fitzpatrick
a206efcf8d Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Mathias Agopian
df8368925a am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 14:46:40 -08:00
Mathias Agopian
af4fa5d83d am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 14:46:35 -08:00
Mathias Agopian
6b72702f30 am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 14:46:31 -08:00
Mathias Agopian
2d665dd37a am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 14:46:27 -08:00
Mathias Agopian
88bccab35c am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
  minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-25 14:46:22 -08:00
Mathias Agopian
239fd805ef Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:21 -08:00
Mathias Agopian
1955a5c9da Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:14 -08:00
Mathias Agopian
d0441f921b Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:09 -08:00
Mathias Agopian
043a3cddf6 Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:05 -08:00
Mathias Agopian
d3fcd0a1c9 Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread 2011-01-25 14:42:59 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Mathias Agopian
21956040a7 fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.

The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.

This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.

Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.

now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.

noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
2011-01-25 14:19:13 -08:00
Mathias Agopian
68d3478860 partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.

So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.

NOTE: This doesn't entirely fix 3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.

also improve SurfaceFlinger 'dumpsys' log

list the purgatory, which shows windows that have been closed,
but for which the client still has references.
2011-01-25 14:19:13 -08:00
Mathias Agopian
8aa11d82f3 fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.

Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
2011-01-25 14:18:58 -08:00
Mathias Agopian
84c6f5a44c workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.

Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
2011-01-25 14:18:29 -08:00
Mathias Agopian
728d849fc9 minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
2011-01-25 14:18:15 -08:00
Marco Nelissen
4b44026879 am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
  Increase the number of useful bits in the spectrum.
2011-01-25 10:11:09 -08:00
Marco Nelissen
c929677e01 Merge "Increase the number of useful bits in the spectrum." into gingerbread 2011-01-25 10:06:16 -08:00
Nick Pelly
3b61e47a3f am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -08:00
Nick Pelly
b134223f91 Make Mifare Classic increment/decrement operands little endian
Also make sure they are non-negative.

This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.

Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
2011-01-25 07:45:07 -08:00
Hung-ying Tyan
df1cc4ef92 am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
2011-01-24 21:46:23 -08:00
Hung-ying Tyan
cc019c0caa Merge "Get mute state from active call." into gingerbread 2011-01-24 21:13:08 -08:00
Hung-ying Tyan
8a424af1d9 am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-24 19:44:56 -08:00
Hung-ying Tyan
14b6d0620b Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-24 19:41:42 -08:00
Jeff Brown
e9acc40151 am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-24 17:38:32 -08:00
Jeff Brown
d8bdc06f81 Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
Fixed a bug in the handling of SENSOR_LANDSCAPE and SENSOR_PORTAIT
on devices that have a natural landscape orientation.  The old code
was disabling 180 degree orientation detection when it shouldn't have.

Bug: 3381359
Change-Id: I19bd2519e7f69a24835840fbf542aa7349981029
2011-01-24 17:07:36 -08:00
Andreas Huber
ca1cf59f49 am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 16:30:12 -08:00
Andreas Huber
efebdf4bd4 DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
2011-01-24 15:59:14 -08:00
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Brad Fitzpatrick
996de2dd41 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Justin Ho
7cd1cc8319 am 28c4f69a: Updated checkbox assets
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
2011-01-24 13:08:54 -08:00
Justin Ho
28c4f69a93 Updated checkbox assets
Change-Id: I93c979816bc3310c510bf8942c273ce8c411150d
2011-01-24 13:05:06 -08:00
Arnaud Ferir
10ab8617e8 am 5e81a6e2: Fix trace mismatch.
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
2011-01-24 10:49:40 -08:00
Sylvain Fonteneau
e97a42e05c am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-24 10:49:36 -08:00
Arnaud Ferir
5e81a6e21e Fix trace mismatch.
Change-Id: Ie6e9a2baef63d2b5621593203742c2ffeaafc4ba
2011-01-24 12:15:21 -06:00
Sylvain Fonteneau
c5a418ecb7 Handle mock tags in android.nfc.Tag conversion to Parcel.
When generating a mock tag (after a NDEF exchange over LLCP), one of
the internal fields is set to null. This was causing NullPointerException
when being converted to a Parcel.

This is fixed by not including this field in the Parcel for mock tags.

Change-Id: I000e2faa54d71fd755ba7993e1e258743aad98fb
2011-01-24 12:15:13 -06:00
John Wang
78eb92388c am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
2011-01-24 09:26:56 -08:00
John Wang
93300ce2d3 Merge "Enable recovery in RIL wakelock release check." into gingerbread 2011-01-24 09:14:14 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00