Merge commit '23eb822369952931935589a8b838929b4c044fba'
* commit '23eb822369952931935589a8b838929b4c044fba':
Refactor vCard test code and modify unit tests.
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp
* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
Refactor vCard test code and modify unit tests.
Merge commit '043c72766248d0a4783c506fd4f604ed63e763d4'
* commit '043c72766248d0a4783c506fd4f604ed63e763d4':
fix bad link in javadoc that's breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp
* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
fix bad link in javadoc that's breaking SDK build
Factor out all the classes previously embedded in VCardTestsBase.java so that readers are able to
look over each file easily and each class explicitly mention the dependency between each other.
Make all the test cases use mVerifier in VCardTestsBase so that verify() call will not be
forgotten. Actually there were three tests found in which verify() was not called.
Internal issue number: 2195990
Merge commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be'
* commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be':
backout a workaround that is not needed anymore
Merge commit 'ce18c9680e3c151dcd4df5cdaa9fa352ad134691'
* commit 'ce18c9680e3c151dcd4df5cdaa9fa352ad134691':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca'
* commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'
* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601'
* commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601':
If overview width is the same as the current width,
Merge commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715'
* commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715':
-hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7'
* commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7':
Add Gservices flag so that Market can turn on performance logging for specific groups.
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp
* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
backout a workaround that is not needed anymore
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2
* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Previously the wake lock time was 5 seconds but there
are operations which take longer such as setting up
and tearing down so increase the default to 30 seconds.
Also provide TelephonyProperty.PROPERTY_WAKE_LOCK_TIMEOUT
so it can be overridden at build time.
Bug: 2268276
Change-Id: I3ae1fb196564c9fd5b9ea3e3b0927be9dd9ef255
Merge commit 'fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp
* commit 'fc64165ef7116a385ae6d9983ab077adc47a6326':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2
* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp
* commit '57c701463f57ea50f6116690641f376e84c4c290':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2
* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
