Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp
* commit 'b355714a2995ebe343808e06f69da5067f52a833':
SipManager: always return true for SIP API and VOIP support query.
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp
* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
Calculate audio media drift time from AudioSource
Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp
* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
Implement #2964234: Add support for <uses-package> element to aapt
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp
* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
Add BT test instrumentation for reboot tests.
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.
Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
Merge commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe' into gingerbread-plus-aosp
* commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe':
DO NOT MERGE Separate utility methods into utility class.
Merge commit '1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread
* commit '1314219a37403594f833c2c71744040ebd8d9b04':
DO NOT MERGE Separate utility methods into utility class.
Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp
* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
Fix problem in AudioEffect::command() status.
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.
Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp
* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
DO NOT MERGE Separate utility methods into utility class.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close(). The constructor
is derived from setUp() and close() from tearDown().
Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp
* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
SipService: reduce the usage of javax.sdp.*.
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp
* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
Fix a small bug when granting permissions through activity results.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
Clean up some permissions.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.
Also deprecate the activity API to go in the foreground. I didn't
realize that was released in the SDK. It needs to go away.
Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
