Implement java side of file upload. Requires changes to external/
webkit to not break; requires changes to packages/apps/Browser
before it actually is used.
Fix http://b/issue?id=675743
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp
* commit '5a016488da5ff6c1ecdff0b1febd836cc1711531':
Develop ContentResolver-based unit tests for vCard importer and fix vCard code
along with the tests
Make test code not only check the validity of VCardParser but also check
the validity of the data insertion part of ContactStruct class, using
MockContentResolver/MockContentProvider. With these tests, we are now really sure
vCard side appropriately sends vCard data into the resolver.
Fix ContactStruct so that it properly handles ORG property and TITLE property,
though it still does not see Group information. There's no vCard found which
uses Group and ORG and TITLE in convolted orders...
e.g. Current implementation misinterprets the following case, but we're not sure
whether any exporter emits data in this kind of complicated form...
group2.ORG:ComparyA
group1.ORG:CompanyB
group1.TITLE:TitleForA
group2.TITLE:TitleForB
Expected: CompanyA + TitleForA, CompanyB + TitleForB
Actual: CompanyA + TitleForB, CompanyB + TitleForA
Also change the parser part a little, so that some component can be reused via
the other part of vCard code.
Added several additional files for the tests, which ensures that
- ORG/TITLE properties are handled as we expect.
- PREF is appropriately handled and passed to the resolver as "IS_PRIMARY" flag.
-- We discarded the code which ensures that "IS_PRIMARY" is added to only one
field in each type, after the local discussion (the duplication or no primary
state should be handled by the resolver).
Internal Issue number: 2160039
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-mr2
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-mr2
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-mr2
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2
* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2
* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.
Add some missing javadoc for permissions.
The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.
Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp
* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.
Fixes bug b/2155661
Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
