Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550'
* commit 'd0cb228b9af0b67fa3372ee075287e7409249550':
squeeze a few more bits of randomness into /dev/random
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'
* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'
* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'
* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
Revert previous status bar assets. DO NOT MERGE.
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'
* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
DO NOT MERGE Clarify the explanation of Android's security design.
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
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp
* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
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().
