OSDN Git Service
Nick Kralevich [Sat, 14 Jun 2014 04:25:46 +0000 (04:25 +0000)]
am
748f4b8d: Merge "update mLastSlash for gdbserver"
* commit '
748f4b8d42541955850e76972b1ab3d9c98e226d':
update mLastSlash for gdbserver
Nick Kralevich [Sat, 14 Jun 2014 04:21:13 +0000 (04:21 +0000)]
Merge "update mLastSlash for gdbserver"
Nick Kralevich [Fri, 13 Jun 2014 23:24:58 +0000 (16:24 -0700)]
update mLastSlash for gdbserver
the gdbserver special case wasn't updating mLastSlash. Fix it.
Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
Tim Murray [Thu, 12 Jun 2014 23:05:16 +0000 (23:05 +0000)]
am
77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
* commit '
77d28ca25378530f92d409fbd72a38a1e256b59f':
Move FieldPacker over to use large objects on 64-bit.
Nick Kralevich [Thu, 12 Jun 2014 21:07:25 +0000 (21:07 +0000)]
am
1ef888e5: Merge "Add service_contexts to policy update bundles."
* commit '
1ef888e564926b78aeb02ef1085be2f72227b862':
Add service_contexts to policy update bundles.
Tim Murray [Thu, 12 Jun 2014 23:02:48 +0000 (23:02 +0000)]
Merge "Move FieldPacker over to use large objects on 64-bit."
Tim Murray [Thu, 12 Jun 2014 21:17:53 +0000 (14:17 -0700)]
Move FieldPacker over to use large objects on 64-bit.
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
Nick Kralevich [Thu, 12 Jun 2014 21:00:53 +0000 (21:00 +0000)]
Merge "Add service_contexts to policy update bundles."
Riley Spahn [Wed, 11 Jun 2014 22:26:28 +0000 (15:26 -0700)]
Add service_contexts to policy update bundles.
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.
Bug:
12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
Elliott Hughes [Thu, 12 Jun 2014 00:02:42 +0000 (00:02 +0000)]
am
1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '
1a3908e95926acd8add3858be571fe23fa9d047a':
Switch to a type-safe album art interface.
Calin Juravle [Wed, 11 Jun 2014 17:28:33 +0000 (17:28 +0000)]
am
16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '
16719591f4a6b2139b1f3555dcde92d35f488b6a':
Shrink profiler.start-immediately to fit in the maximum property size
Calin Juravle [Wed, 11 Jun 2014 17:28:29 +0000 (17:28 +0000)]
am
2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '
2f84b69bf5afcf67469704e30866067b770ae786':
Improved profile.start-immediately comment
Elliott Hughes [Wed, 11 Jun 2014 23:59:33 +0000 (23:59 +0000)]
Merge "Switch to a type-safe album art interface."
Elliott Hughes [Tue, 10 Jun 2014 23:53:31 +0000 (16:53 -0700)]
Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)
Bug:
15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
Calin Juravle [Wed, 11 Jun 2014 17:25:10 +0000 (17:25 +0000)]
Merge "Shrink profiler.start-immediately to fit in the maximum property size"
Calin Juravle [Wed, 11 Jun 2014 17:21:41 +0000 (18:21 +0100)]
Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
Calin Juravle [Wed, 11 Jun 2014 17:25:02 +0000 (17:25 +0000)]
Merge "Improved profile.start-immediately comment"
Calin Juravle [Tue, 10 Jun 2014 13:52:24 +0000 (14:52 +0100)]
Improved profile.start-immediately comment
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
Elliott Hughes [Mon, 9 Jun 2014 16:30:03 +0000 (16:30 +0000)]
am
2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
* commit '
2a1ed46decbc8e21a39367a4b7770111392167c3':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Elliott Hughes [Mon, 9 Jun 2014 16:26:27 +0000 (16:26 +0000)]
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
Elliott Hughes [Mon, 9 Jun 2014 16:22:58 +0000 (09:22 -0700)]
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
Robin Lee [Mon, 9 Jun 2014 12:51:19 +0000 (12:51 +0000)]
am
01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '
01c07a856de163dc9a6fd31ea4b42293d221ee63':
Choose CA certificate storage according to userId
Robin Lee [Mon, 9 Jun 2014 12:47:08 +0000 (12:47 +0000)]
Merge "Choose CA certificate storage according to userId"
Robin Lee [Fri, 25 Apr 2014 13:57:49 +0000 (14:57 +0100)]
Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.
This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.
Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
Calin Juravle [Mon, 9 Jun 2014 09:23:18 +0000 (09:23 +0000)]
am
97f7f24c: Merge "Fixed comments related to profile properties."
* commit '
97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
Fixed comments related to profile properties.
Calin Juravle [Mon, 9 Jun 2014 09:18:23 +0000 (09:18 +0000)]
Merge "Fixed comments related to profile properties."
Calin Juravle [Fri, 6 Jun 2014 15:00:53 +0000 (16:00 +0100)]
Fixed comments related to profile properties.
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
Ian Rogers [Fri, 6 Jun 2014 19:42:12 +0000 (19:42 +0000)]
am
d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
* commit '
d83ffe358db81abbde44ec38cd9121e67d25fbb3':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Ian Rogers [Fri, 6 Jun 2014 19:34:12 +0000 (19:34 +0000)]
Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
Calin Juravle [Fri, 6 Jun 2014 12:09:48 +0000 (12:09 +0000)]
am
bbf849b1: Merge "Add missing profiler options."
* commit '
bbf849b1c686c9e09c4d59574da70181a47ebb5d':
Add missing profiler options.
Calin Juravle [Fri, 6 Jun 2014 12:06:36 +0000 (12:06 +0000)]
Merge "Add missing profiler options."
Calin Juravle [Mon, 2 Jun 2014 15:45:13 +0000 (16:45 +0100)]
Add missing profiler options.
Bug:
12877748
Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit
e345507ca4b7b83c6e0446788f4404eb697f945b)
Elliott Hughes [Thu, 5 Jun 2014 18:19:16 +0000 (18:19 +0000)]
am
b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit '
b2842e72819b3eb724503290e9eaa7c50f65e45b':
[LP64] Fix access to MediaAlbumArt.
Elliott Hughes [Thu, 5 Jun 2014 18:02:04 +0000 (18:02 +0000)]
Merge "[LP64] Fix access to MediaAlbumArt."
Elliott Hughes [Thu, 5 Jun 2014 17:38:30 +0000 (10:38 -0700)]
[LP64] Fix access to MediaAlbumArt.
The mSize field is a uint32_t, not a long.
Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
Robin Lee [Thu, 5 Jun 2014 17:26:29 +0000 (17:26 +0000)]
am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
271251d739db12838d1521bcf885b4943e9b00b1':
Add Environment call: get config dir for some user
Robin Lee [Thu, 5 Jun 2014 17:16:51 +0000 (17:16 +0000)]
Merge "Add Environment call: get config dir for some user"
Robin Lee [Mon, 28 Apr 2014 15:03:22 +0000 (16:03 +0100)]
Add Environment call: get config dir for some user
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.
Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
Elliott Hughes [Wed, 4 Jun 2014 21:46:12 +0000 (21:46 +0000)]
am
759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '
759a89782d38ddf6ab7f4a2c22c8911ea206b275':
Minor javadoc improvements for PackageManager.
Elliott Hughes [Wed, 4 Jun 2014 21:29:08 +0000 (21:29 +0000)]
am
c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
* commit '
c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
Elliott Hughes [Wed, 4 Jun 2014 21:26:49 +0000 (21:26 +0000)]
Merge "Minor javadoc improvements for PackageManager."
Elliott Hughes [Wed, 4 Jun 2014 21:13:56 +0000 (21:13 +0000)]
Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
Robin Lee [Wed, 4 Jun 2014 20:55:02 +0000 (20:55 +0000)]
am
e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit '
e46e60041215249a285384cd2282de9f4d956a04':
Assign AID_EVERYONE gid to newly-created processes
Robin Lee [Wed, 4 Jun 2014 20:51:53 +0000 (20:51 +0000)]
Merge "Assign AID_EVERYONE gid to newly-created processes"
Tim Murray [Wed, 4 Jun 2014 17:39:54 +0000 (17:39 +0000)]
am
fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit '
fdb15a76a30de169aac63d4c2260aa293477557e':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Fri, 31 Jan 2014 20:57:20 +0000 (12:57 -0800)]
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
Amaury Medeiros [Tue, 3 Jun 2014 23:06:41 +0000 (20:06 -0300)]
Minor javadoc improvements for PackageManager.
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.
Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
Tim Murray [Tue, 3 Jun 2014 21:36:19 +0000 (21:36 +0000)]
Merge "Add support for mixed 32/64 APKs using RenderScript."
Adam Lesinski [Tue, 3 Jun 2014 20:11:13 +0000 (20:11 +0000)]
Merge "Add --pseudo-localize option to generate resources for pseudolocales."
Tim Murray [Fri, 16 May 2014 18:47:26 +0000 (11:47 -0700)]
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
Igor Viarheichyk [Tue, 3 Jun 2014 00:16:24 +0000 (17:16 -0700)]
Add --pseudo-localize option to generate resources for pseudolocales.
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.
Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
Narayan Kamath [Tue, 3 Jun 2014 13:56:03 +0000 (13:56 +0000)]
Merge "Fix build."
Narayan Kamath [Tue, 3 Jun 2014 13:54:36 +0000 (14:54 +0100)]
Fix build.
Bad resolution of a manual rebase.
Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
Narayan Kamath [Tue, 3 Jun 2014 12:20:05 +0000 (12:20 +0000)]
Merge "Scan for renderscript files before deciding ABIs."
Narayan Kamath [Fri, 16 May 2014 15:45:56 +0000 (16:45 +0100)]
Scan for renderscript files before deciding ABIs.
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.
bug:
14900093
Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
Narayan Kamath [Tue, 3 Jun 2014 11:10:01 +0000 (11:10 +0000)]
Merge "Add an --abi argument to "pm install""
Narayan Kamath [Thu, 29 May 2014 10:51:59 +0000 (11:51 +0100)]
Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.
Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
Narayan Kamath [Tue, 3 Jun 2014 09:57:02 +0000 (09:57 +0000)]
Merge "Log process abis during start."
Mike Lockwood [Mon, 2 Jun 2014 18:25:35 +0000 (18:25 +0000)]
am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
1c725866da02c3e1f62fb416ea3450caed406f2a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:25:28 +0000 (18:25 +0000)]
am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
27eb205e21e7715764084085f382d690e0406c63':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:21:17 +0000 (18:21 +0000)]
Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
Mike Lockwood [Mon, 2 Jun 2014 18:20:39 +0000 (18:20 +0000)]
Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
Martin Blumenstingl [Sat, 31 May 2014 13:53:00 +0000 (15:53 +0200)]
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
Martin Blumenstingl [Sat, 31 May 2014 13:50:38 +0000 (15:50 +0200)]
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().
Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
Nick Kralevich [Sat, 31 May 2014 05:27:46 +0000 (05:27 +0000)]
am
4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."
* commit '
4f8785f28e6305d427cc3e483248828c9b9b06a2':
SELinuxMMAC additions to perform policy versioning checks.
Nick Kralevich [Sat, 31 May 2014 05:25:14 +0000 (05:25 +0000)]
Merge "SELinuxMMAC additions to perform policy versioning checks."
Nick Kralevich [Sat, 31 May 2014 05:09:37 +0000 (05:09 +0000)]
am
3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
* commit '
3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
Allow SELinuxPolicyInstallReceiver to update new policy files.
Nick Kralevich [Sat, 31 May 2014 05:07:12 +0000 (05:07 +0000)]
Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
Elliott Hughes [Sat, 31 May 2014 02:26:36 +0000 (02:26 +0000)]
am
5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '
5568e0e45fff7ffe5061770cb527b22d09cf5519':
Move frameworks/base off private libcore.ICU API.
Elliott Hughes [Sat, 31 May 2014 02:22:24 +0000 (02:22 +0000)]
Merge "Move frameworks/base off private libcore.ICU API."
Elliott Hughes [Sat, 31 May 2014 02:20:20 +0000 (19:20 -0700)]
Move frameworks/base off private libcore.ICU API.
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
Chris Craik [Fri, 30 May 2014 17:59:51 +0000 (17:59 +0000)]
am
ce7fa780: Merge "Fix a resource race bug in PathCache"
* commit '
ce7fa780cdee2730b570cc34066f15c74d44e6ef':
Fix a resource race bug in PathCache
Chris Craik [Fri, 30 May 2014 17:56:42 +0000 (17:56 +0000)]
Merge "Fix a resource race bug in PathCache"
Narayan Kamath [Fri, 30 May 2014 10:41:24 +0000 (10:41 +0000)]
am
bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit '
bd4d320344833ce67dad3a4e10a61d0502a81d0e':
Support an ABI flag for instrumentation.
Narayan Kamath [Fri, 30 May 2014 10:35:27 +0000 (10:35 +0000)]
Merge "Support an ABI flag for instrumentation."
yuyang [Tue, 27 May 2014 08:15:02 +0000 (16:15 +0800)]
Fix a resource race bug in PathCache
When enabled defer rendering, it will do precache for DrawPathOp.
The paint used for creating PathTask in precache just get the address
of mFilteredPaint of OpenGLRenderer. So for the following defer
operation like DrawTextOp has possibility change the mFilteredPaint
by getPaint while another WorkerThread in PathCache is using the paint
which pointed to the same address of mFilteredPaint to generate bitmap.
As a result, it will generate a wrong bitmap for generateTexture in
PathCache. To fix it, do a copy of paint when creating PathTask.
CRs-Fixed: 664244
Change-Id: I5516f5b143458b88d3573d15b7ebb34f688800c7
Jianzheng Zhou [Fri, 30 May 2014 01:54:51 +0000 (09:54 +0800)]
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
Change-Id: Ied20e4c7e0e4aa648a76fbe80dd1f0dd30b948a9
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Narayan Kamath [Thu, 29 May 2014 17:04:57 +0000 (18:04 +0100)]
Log process abis during start.
Adds to the info log that the activity manager emits
during every app launch.
Change-Id: Icd442334cb0e0e0fd0cc529c6b9c315a47d4aadc
Wink Saville [Thu, 29 May 2014 04:57:25 +0000 (04:57 +0000)]
am
9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."
* commit '
9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
Wink Saville [Thu, 29 May 2014 04:53:52 +0000 (04:53 +0000)]
Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."
Zhang Wei-e7976c [Fri, 31 Jan 2014 23:18:42 +0000 (15:18 -0800)]
Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
Brian Carlstrom [Wed, 28 May 2014 22:31:39 +0000 (22:31 +0000)]
am
197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
197565e0e800be3c731e679914f40afa1aab98fd':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:39 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry-picked from commit
2ef5abb8d534f016582d6023054cbe69d8114b6b)
Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
Elliott Hughes [Wed, 28 May 2014 21:41:30 +0000 (21:41 +0000)]
am
862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
* commit '
862be91276ec9532b3ed00d43fc7a750f1e6adb0':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Wed, 28 May 2014 21:36:32 +0000 (21:36 +0000)]
Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
Brigid Smith [Wed, 28 May 2014 21:13:41 +0000 (14:13 -0700)]
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
Narayan Kamath [Wed, 28 May 2014 08:48:23 +0000 (08:48 +0000)]
am
b75b3aaa: Merge "Build PacProcessor for 64 bit."
* commit '
b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
Build PacProcessor for 64 bit.
Narayan Kamath [Wed, 28 May 2014 08:44:36 +0000 (08:44 +0000)]
Merge "Build PacProcessor for 64 bit."
Narayan Kamath [Tue, 27 May 2014 16:06:18 +0000 (17:06 +0100)]
Build PacProcessor for 64 bit.
external/chromium-libpac can now build for 64 bit.
Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
Narayan Kamath [Tue, 27 May 2014 11:00:48 +0000 (11:00 +0000)]
am
6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit '
6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
PacProccesor: Only build for 32-bit
Narayan Kamath [Tue, 27 May 2014 10:57:20 +0000 (10:57 +0000)]
Merge "PacProccesor: Only build for 32-bit"
Andreas Gampe [Fri, 18 Apr 2014 23:10:25 +0000 (16:10 -0700)]
PacProccesor: Only build for 32-bit
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.
(cherry picked from commit
f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)
Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
Eric Laurent [Fri, 23 May 2014 21:37:54 +0000 (21:37 +0000)]
am
ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit '
ba64d298bee228b8e27ea17fb31fbff4b4188304':
AudioService: fix cross deadlock in VolumeStreamState
Eric Laurent [Fri, 23 May 2014 21:34:25 +0000 (21:34 +0000)]
Merge "AudioService: fix cross deadlock in VolumeStreamState"
Eric Laurent [Mon, 12 May 2014 22:26:12 +0000 (15:26 -0700)]
AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.
Bug:
13730145.
Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
Dmitriy Ivanov [Fri, 23 May 2014 02:35:42 +0000 (02:35 +0000)]
am
d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '
d5ee4144c4beae54219e1b8eb10418b02dd4a63b':
Increase start timeout for wrapped process
Dmitriy Ivanov [Fri, 23 May 2014 02:31:37 +0000 (02:31 +0000)]
Merge "Increase start timeout for wrapped process"
Christopher Tate [Fri, 23 May 2014 02:22:40 +0000 (02:22 +0000)]
am
a0166b58: Merge "Activity chooser "Always" button is not working"
* commit '
a0166b58de38e0d2d67f9d847d307cf3ce7bf633':
Activity chooser "Always" button is not working