Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp
* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
Update the documentation for content provider security.
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Without this documentation fix, developers will not know that
apps on pre-Gingercomb devices will inadvertantly export their content
providers. With knowledge of the solid workaround, they can make their apps
secure.
Change-Id: I1f096aff19500cd3d3fd2955a9dec59d8e7c6a73
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp
* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
docs: a few style adjustments to admin doc
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread
* commit '50f86c65206072be0ca924f03b8d460365199bcd':
docs: a few style adjustments to admin doc
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp
* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
docs: consistency fixit for the quickview boxes in the dev guide
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread
* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
docs: consistency fixit for the quickview boxes in the dev guide
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
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 '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp
* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
docs: add more info about state list drawable and onclick attribute to Button
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread
* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
docs: add more info about state list drawable and onclick attribute to Button
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp
* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
Fix closing tag in docs.
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp
* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp
* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
docs: add dev guide for getting user location
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
The ratio between densities is not constant.
The Exception for dpi qualifier in point 4 of the algorithm should be detailed.
I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.
Cherry-picked from master CL 59188.
Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
