Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp
* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp
* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
Revert previous status bar assets. DO NOT MERGE.
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp
* commit '83ea6389097570e8526a0b612051bb591186f165':
The old overlay should be destroyed if orientation changes.
Assert plainly that Dalvik is not a boundary.
Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".
Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID. But
it's important to clarify what we mean.
Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.
Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp
* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
Use buffered I/O during certificate parsing
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp
* commit 'd8691d73d158acd9ffc63748126e822afd656707':
Allow all apps to call ContentResolver.getType().
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp
* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
We only need at most one tty icon.
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
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
+ 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 '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp
* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
Adding a feature to indicate that the device possesses low-latency audio.
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp
* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp
* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
Support other kinds of HTTP redirect in NuHTTPDataSource
Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp
* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
Fix the unhold issue especially if one is behind NAT.
Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp
* commit '9627847d588cd969f60dcc79d165209184a90069':
Fix error in AudioEffect command status reporting.
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp
* commit '465618ed567c418442890fcf91b6ee361b22b88b':
Use buffered output during packages.xml write
The PackageParser was using a raw InputStream instead of wrapping it in
a BufferedInputStream which could degrade performance.
Change-Id: I15c86c3ead363ddbadf4ae27e011feda90fcc579
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
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
