4030 Commits

Author SHA1 Message Date
Nick Kralevich
b91ec410c8 squeeze a few more bits of randomness into /dev/random
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
2010-09-27 14:49:00 -07:00
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
2010-09-27 14:40:38 -07:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process.
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
2010-09-28 05:19:35 +08:00
Wu-cheng Li
191a25e1da am 83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp

* commit '83ea6389097570e8526a0b612051bb591186f165':
  The old overlay should be destroyed if orientation changes.
2010-09-27 14:12:49 -07:00
Wu-cheng Li
83ea638909 Merge "The old overlay should be destroyed if orientation changes." into gingerbread 2010-09-27 14:09:02 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
2010-09-27 12:45:31 -07:00
Dianne Hackborn
d8691d73d1 Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
2010-09-27 12:37:03 -07:00
Jeff Brown
14a288da6a Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Hung-ying Tyan
2079843412 am 45a83a89: am fccd5bc7: Fix build.
Merge commit '45a83a896701f61f72082f7116b85d1537ebf4cb'

* commit '45a83a896701f61f72082f7116b85d1537ebf4cb':
  Fix build.
2010-09-27 11:57:08 -07:00
Hung-ying Tyan
45a83a8967 am fccd5bc7: Fix build.
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp

* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
  Fix build.
2010-09-27 11:52:35 -07:00
Wu-cheng Li
b3347bc6d7 The old overlay should be destroyed if orientation changes.
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.

bug:3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
2010-09-27 11:49:56 -07:00
Hung-ying Tyan
6cf8f64be3 am c5027642: am 025a39af: SIP: misc fixes
Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d'

* commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d':
  SIP: misc fixes
2010-09-27 11:47:37 -07:00
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
2010-09-27 11:47:32 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
2010-09-27 11:20:30 -07:00
Hung-ying Tyan
fe2d279c5e am 00a22064: SipService: handle cross-domain authentication error
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
2010-09-27 11:20:24 -07:00
Hung-ying Tyan
fccd5bc78f Fix build.
Change-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d
2010-09-28 02:16:32 +08:00
Hung-ying Tyan
025a39af34 SIP: misc fixes
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
2010-09-28 01:52:42 +08:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
2010-09-27 10:45:24 -07:00
Kenny Root
831f898756 am 8f767774: am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '8f767774230cba9b5cfc298f2e24972a79cd0182'

* commit '8f767774230cba9b5cfc298f2e24972a79cd0182':
  Use buffered output during packages.xml write
2010-09-27 08:28:07 -07:00
Kenny Root
8f76777423 am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp

* commit '465618ed567c418442890fcf91b6ee361b22b88b':
  Use buffered output during packages.xml write
2010-09-27 08:15:57 -07:00
Jeff Brown
01ce2e9eee Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time.  Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
2010-09-26 22:20:12 -07:00
Dianne Hackborn
8313fc7e94 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-26 21:31:47 -07:00
Kenny Root
9f306d78a4 Use buffered output during packages.xml write
FileOutputStream writes data one byte at a time, so use the
BufferedOutputStream to wrap it and write once all the XML serialization
is done.

Change-Id: I419a6fcac2ac9a72a6cf41d4ca6e7ab6c7505618
2010-09-26 11:19:47 -07:00
Mathias Agopian
d95fec0891 am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '495ad4f22096aa172d025c16c25497e7dad8f2bd'

* commit '495ad4f22096aa172d025c16c25497e7dad8f2bd':
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:13:22 -07:00
Mathias Agopian
495ad4f220 am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit 'beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp

* commit 'beabe75a842d521b005999460d3a6361ab32108e':
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:07:41 -07:00
Mathias Agopian
beabe75a84 Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Jeff Brown
22ba86cfaf am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0'

* commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0':
  Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:14:08 -07:00
Jeff Brown
ca25d2c31d am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp

* commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813':
  Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:07:24 -07:00
Jeff Brown
4d94a766c3 Fixed some timeout and lock reentrance issues with broadcasts.
When starting a broadcast, the ActivityManagerService posts a delayed
BROADCAST_TIMEOUT_MSG to handle timeouts.  If a premature timeout occurs,
we post a new BROADCAST_TIMEOUT_MSG to extend the timeout time for the
current receiver.  However, if the current receiver does timeout, the
message is consumed and no replacement is ever posted.

To fix the dropped timeouts, we track whether we have a pending broadcast
timeout message and setup a new one when we begin working on the next receiver.

As a last resort, performNextBroadcast contains code to detect whether
a broadcast appears to be hung (timeout handling failed).  If so, it
calls broadcastTimeout to cause it to timeout immediately.
However, performNextBroadcast is holding on to the ActivityManagerService
lock while doing this but broadcastTimout expected to be called
while the lock was not held since after updating the broadcast record state,
it calls appNotResponding.

To fix the unintentended lock reentrance, changed broadcastTimeout to
assume the lock is already held (and the callers ensure this) then
added code to perform the ANR asynchronously.

Renamed a few methods to add "Locked" suffixes where appropriate and added
a few comments for tricky areas uncovered during review.

Change-Id: I3cb5b06d6b6a4a338f32c0998db721f6acf3b082
2010-09-24 16:00:25 -07:00
Dianne Hackborn
405e012681 am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14'

* commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14':
  Some debugging support.
2010-09-24 15:58:25 -07:00
Hung-ying Tyan
3011b66172 am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:58:09 -07:00
Dianne Hackborn
deaa8ff1b1 am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp

* commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503':
  Some debugging support.
2010-09-24 15:32:51 -07:00
Dianne Hackborn
a7ef18fca5 Merge "Some debugging support." into gingerbread 2010-09-24 15:28:34 -07:00
Hung-ying Tyan
d6d8327918 am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp

* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:19:05 -07:00
Hung-ying Tyan
194bbcce9b SIP: longer timeout for making call, shorter for cancelling
http://b/3021865

Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
2010-09-25 06:09:00 +08:00
Mathias Agopian
dce21a3e27 simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
2010-09-24 15:01:49 -07:00
Mathias Agopian
ca5edbeba9 add support for [1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured

Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
2010-09-24 14:56:39 -07:00
Robert Greenwalt
f333123d50 resolved conflicts for merge of 2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
2010-09-24 14:47:06 -07:00
Dianne Hackborn
f123e49bf0 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Laurent
8fee382010 am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e'

* commit '692dfafe02d04cdbab5367546e166580c92e4d2e':
  Fix issue 3007862
2010-09-24 10:34:28 -07:00
Eric Laurent
692dfafe02 am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp

* commit '880dfe4f675128188f8d598f2025a417ccabd1bf':
  Fix issue 3007862
2010-09-24 09:49:07 -07:00
Eric Laurent
880dfe4f67 Merge "Fix issue 3007862" into gingerbread 2010-09-24 09:43:24 -07:00
Eric Laurent
98c92599ac Fix issue 3007862
Removed a cross deadlock condition between audioflinger and audio policy
service mutexes.
Audioflinger::createEffect() locks audioflinger mutex and then calls
AudioSystem::getOutputForEffect() which ends up in
AudioPolicyService::getOutputForEffect() which locks audio policy service
mutex. If at the same time, the command thread in audio policy service is
processing a command(set volume, set route...), the mutex is locked and the
command will call one audioflinger method which in turn will attempt to
lock audioflinger mutex.
The fix consists in releasing audioflinger mutex before calling
getOutputForEffect().

Change-Id: Id44e7feb36e0a295731f6aa97cf32d022edd34d0
2010-09-24 09:32:40 -07:00
Chia-chi Yeh
50d9f32506 am 33460d83: am 658bec95: SDP: remove dead code.
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36'

* commit '33460d836fc2a062290d72ebcfb73af51ffa9c36':
  SDP: remove dead code.
2010-09-23 22:50:10 -07:00
Hung-ying Tyan
22a62d1342 resolved conflicts for merge of ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
2010-09-24 13:45:43 +08:00
Joe Onorato
77cf6f29f9 am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit '982c07e908c4cb66db224ccfd0810bf8bd449835'

* commit '982c07e908c4cb66db224ccfd0810bf8bd449835':
  Crash apps when they provide bad notifications instead of crashing the system process.
2010-09-23 21:40:24 -07:00
Chung-yih Wang
01a411326e am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.
2010-09-23 21:39:49 -07:00