3722 Commits

Author SHA1 Message Date
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
2010-09-29 07:38:55 -07:00
Ulf Rosdahl
39357708b7 Corrected visibility reporting error in WindowManager
Correction for the error:
When a window is done animating and about to be destroyed,
it is still checked for visibility in the method
updateReportedVisibilityLocked in the WindowManager.
In the case where other windows are ready to be reported as
visible, this, not yet destroyed window which has the state
not visible, will prevent the visibility report message from
being sent.

Change-Id: I9e307a678a204f0883ccd78c2645c373d3f81066
2010-09-29 12:34:38 +02:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Mike Lockwood
05e1105061 am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
2010-09-28 20:18:36 -07:00
Mike Lockwood
4da4827504 Revert "Check for the DEVICE_POWER permission in userActivity."
The change broke SetupWizard and probably other apps

This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
2010-09-28 23:07:26 -04:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
2010-09-28 17:33:47 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Joe Onorato
f5bdeba197 am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.
2010-09-28 17:22:09 -07:00
Joe Onorato
ea2cf2f936 Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 2010-09-28 17:19:37 -07:00
Joe Onorato
059f8f93e6 Check for the DEVICE_POWER permission in userActivity.
Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
2010-09-28 17:14:34 -07:00
Eric Laurent
b047e3cdf2 am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread
Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp

* commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
  Fix several audio effects problems.
2010-09-28 16:42:14 -07:00
Eric Laurent
4fd3ecc1f0 Fix several audio effects problems.
Fixed the following issues in LVM effect bundle wrapper:
- memory leaks in EffectCreate() in case effect creation fails at various stages
- Added saturation when accumulating to output buffer
- Fixed problems with enabled effects count when an effect is released while enabled
- Do not allocate temporary buffer for accumulation each time process() is called

Fixed the following issues in effects framework (AudioFlinger)
- Release effect synchronously in the library when deleted from effect chain
- Do not call the effect process function if no tracks are present in the same
audio session

Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
2010-09-28 14:23:39 -07:00
Dianne Hackborn
b763a6dc41 am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp

* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
  Fixes to granting URI permissions - take into account path perms.
2010-09-28 11:32:38 -07:00
Dianne Hackborn
08cf57d791 Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 2010-09-28 11:21:27 -07:00
Dianne Hackborn
48058e8536 Fixes to granting URI permissions - take into account path perms.
Change-Id: I8073061a578eda90dadd3b0b909047aae0d64f2d
2010-09-28 11:20:21 -07:00
Irfan Sheriff
6db6468956 am c89dd54c: Remove logging on wifilock acquire/release
Merge commit 'c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp

* commit 'c89dd54ceeec99173d51d1196e2c03a58f120211':
  Remove logging on wifilock acquire/release
2010-09-28 10:26:29 -07:00
Irfan Sheriff
c89dd54cee Remove logging on wifilock acquire/release
Bug: 3042300
Change-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266
2010-09-28 10:13:14 -07:00
Christian Lindeberg
03d2ca6ee0 Include debugger connection status in error entry
Include the debugger connection status when adding error entry
to DropBox if debugger is connected, "Debugger: Connected".

This can be useful to sort out crashes comming from developers
vs from regular usage.

Change-Id: Ic309066c63778af1577f2b91a95ffca0bd40338c
2010-09-28 14:52:20 +02:00
repo sync . build/envsetup.sh lunch passion-en
8c66580759 am 4fc3d2f0: DO NOT MERGE
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
2010-09-27 17:51:45 -07:00
repo sync . build/envsetup.sh lunch passion-eng
4fc3d2f0b3 DO NOT MERGE
This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.

Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
2010-09-27 17:46:07 -07:00
Hung-ying Tyan
2a36a778d3 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
2010-09-27 16:29:33 -07:00
Hung-ying Tyan
68ef7f3c3a Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Nick Kralevich
d0cb228b9a am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp

* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
  squeeze a few more bits of randomness into /dev/random
2010-09-27 15:26:51 -07:00
Nick Kralevich
23142acffa Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Nick Kralevich
b91ec410c8 squeeze a few more bits of randomness into /dev/random
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
2010-09-27 14:49:00 -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
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
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
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
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
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