Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp
* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp
* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp
* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
DO NOT MERGE Initialize bluetooth profiles in BT stress tests
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp
* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
Changed handling of onQueryCompelete to not use mimeType.
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.
bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
Merge commit '62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp
* commit '62ec9834a09c9037d195c306fd838b4c0425e7e2':
Make SipService broadcast SIP_SERVICE_UP when it's up.
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp
* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
Import revised translations. DO NOT MERGE
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp
* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
Parser is optional in obtainStyledAttributes.
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp
* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
Make Activity.removeDialog() less strict.
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp
* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
Add MountService tests and fix a bug it found
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp
* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp
* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
New assets for buttons and notification
Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp
* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
Make USB mass storage hide keyguard when shown.
Display orientation should be considered while setting preview size,
picture size, or thumbnail size.
bug:3051937
Change-Id: I3b6bd1b920e4752ffdfc8aec56a0da9d474dd630
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.
Highlights:
* New assets are translucent - increased visibility for whatever is
beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.
Change-Id: I601361323916ee19149562a23dc3242d908da45c
An incorrect assumption about how death observers were tracked lead to
an IllegalArgumentException in some cases. Make sure the linking and
unlinking of the Binder to its ObbState death observer is symmetric to
avoid this problem.
Bug: 3062360
Change-Id: Idd016db12551c80cd74d00f11cf6569bd3b4ce21
Add a retry count and give up after two attempts.
Also stop auto registration when server is unreachable.
And rename onError() to restartLater() for better readability.
http://b/issue?id=3066573
Change-Id: Icfa65c58546a1e2bf8e59e29584a3926c53c479b
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.
Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.
Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.
Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
