Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp
* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
location: rebind to network location and geocoder services after package update
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp
* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp
* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
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
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp
* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
Revert "Check for the DEVICE_POWER permission in userActivity."
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp
* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
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
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp
* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp
* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
Fixes to granting URI permissions - take into account path perms.
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
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp
* commit 'd8691d73d158acd9ffc63748126e822afd656707':
Allow all apps to call ContentResolver.getType().
+ 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
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.
http://b/issue?id=3020185
Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp
* commit '465618ed567c418442890fcf91b6ee361b22b88b':
Use buffered output during packages.xml write
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
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
Merge commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp
* commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813':
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
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp
* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
SIP: longer timeout for making call, shorter for cancelling
- 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
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp
* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
Move long Connectivity tasks to handler thread.
