OSDN Git Service
Shubham Ajmera [Wed, 9 Mar 2016 09:57:16 +0000 (09:57 +0000)]
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"
Brian Carlstrom [Wed, 9 Mar 2016 03:30:16 +0000 (03:30 +0000)]
Merge "Remove unneeded dependecy on core-tests to fix build"
Brian Carlstrom [Wed, 9 Mar 2016 01:26:54 +0000 (17:26 -0800)]
Remove unneeded dependecy on core-tests to fix build
Bug:
27555885
(cherry picked from commit
2687673025f9b5a86f917135d2a8288d4f31818b)
Change-Id: I6c0aee5c1823b6c498d9306e4a7c749b093e6834
Yang Ni [Tue, 8 Mar 2016 21:09:11 +0000 (21:09 +0000)]
Merge "Revert "Set flags in RS JNI calls for rsObj creation""
am:
5a6d9b6656
* commit '
5a6d9b6656b3ebd8956c4a129b17c372585d23a9':
Revert "Set flags in RS JNI calls for rsObj creation"
Yang Ni [Tue, 8 Mar 2016 21:02:25 +0000 (21:02 +0000)]
Merge "Revert "Set flags in RS JNI calls for rsObj creation""
Yang Ni [Tue, 8 Mar 2016 21:01:54 +0000 (21:01 +0000)]
Revert "Set flags in RS JNI calls for rsObj creation"
This reverts commit
ad88055821a7aba3318f066c4e5f87bd0315462c.
Change-Id: I53a3f59022e2607216f4dd89bc2e28e0bd987785
Yi Kong [Tue, 8 Mar 2016 19:12:48 +0000 (19:12 +0000)]
Yi Kong [Tue, 8 Mar 2016 19:09:10 +0000 (19:09 +0000)]
Yi Kong [Tue, 8 Mar 2016 09:21:18 +0000 (09:21 +0000)]
Track libcore change
f121f31fd91c5a557225cd6a97418e716529eb2d
Bug:
27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
Shubham Ajmera [Tue, 8 Mar 2016 02:27:10 +0000 (02:27 +0000)]
Port OpenJDK8 java.util.*SummaryStatistics & add tests
Ported OpenJDK8 java.util.DoubleSummaryStatistics,
java.util.IntSummaryStatistics, java.util.LongSummaryStatistics.
Based on openJdk 8u40 source & iam@ stream change in
ag/872080
Bug:
27426738
Change-Id: I54f3fba1142327f990c0a71acbbef0b7bb0e0a27
Adam Powell [Mon, 7 Mar 2016 23:50:51 +0000 (23:50 +0000)]
Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
am:
9d39648de4
* commit '
9d39648de4c9070ddc770d301e822bdc72db4ba9':
Restore auto-launch behavior for ACTION_CHOOSER with a single choice
Adam Powell [Mon, 7 Mar 2016 23:46:15 +0000 (23:46 +0000)]
Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
George Burgess IV [Mon, 7 Mar 2016 22:56:12 +0000 (22:56 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
am:
5a3ac10568
* commit '
5a3ac10568e5d729d604c90117550f253ba4b080':
Cleanup uses of sprintf so we can deprecate it.
George Burgess IV [Mon, 7 Mar 2016 22:51:03 +0000 (22:51 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
Neil Fuller [Fri, 4 Mar 2016 13:03:48 +0000 (13:03 +0000)]
Merge "Change libraries needed by layoutlib to "host" libs"
am:
709bf582cf
* commit '
709bf582cf949680da976e3f6cd5bf03396b1db1':
Change libraries needed by layoutlib to "host" libs
Narayan Kamath [Fri, 4 Mar 2016 12:59:47 +0000 (12:59 +0000)]
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Change libraries needed by layoutlib to "host" libs"
Narayan Kamath [Fri, 4 Mar 2016 12:54:59 +0000 (12:54 +0000)]
Narayan Kamath [Fri, 4 Mar 2016 12:47:17 +0000 (12:47 +0000)]
Narayan Kamath [Thu, 3 Mar 2016 22:35:46 +0000 (22:35 +0000)]
Track libcore change
e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
bug:
27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501
Narayan Kamath [Fri, 4 Mar 2016 12:41:50 +0000 (12:41 +0000)]
Neil Fuller [Tue, 1 Mar 2016 18:46:37 +0000 (18:46 +0000)]
Change libraries needed by layoutlib to "host" libs
They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.
Bug:
27218410
(cherry picked from commit
d34e33bc831b51c62630829c188ee0039580ac60)
Change-Id: I8febfca41b3e9baaf290e53ca1449254d4cc9b46
Pirama Arumuga Nainar [Fri, 4 Mar 2016 00:09:27 +0000 (00:09 +0000)]
Merge changes I3651e5ae,I37058468
am:
f033a6ca9f
* commit '
f033a6ca9f1ebe810b511861267665948bcd019e':
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
Pirama Arumuga Nainar [Fri, 4 Mar 2016 00:06:04 +0000 (00:06 +0000)]
Merge changes I3651e5ae,I37058468
* changes:
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
Pirama Arumuga Nainar [Wed, 2 Mar 2016 04:37:19 +0000 (20:37 -0800)]
[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
http://b/
27251511
Handle FLOAT_16 case to PER_ARRAY_TYPE macro to enable untyped variants
of Allocation-copy functions.
Untyped variants of Allocation-copy functions call
validateObjectIsPrimitiveArray(), with checkType parameter set to true,
to validate and obtain the Element type of the Allocation. When
checkType is true, validateObjectIsPrimitiveArray() returns the actual
Element type of the Allocation (instead of the canonical SIGNED type).
Because of this, FLOAT_16 element type can reach the JNI layer,
necessitating this change to PER_ARRAY_TYPE macro.
Change-Id: I3651e5ae0ab0cd6bb4ad3157841e2910ac8699dc
(cherry picked from commit
85e8c51dbf8dc774ecfd09981ac6a8bf1b75f464)
Pirama Arumuga Nainar [Fri, 26 Feb 2016 17:16:17 +0000 (09:16 -0800)]
[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
http://b/
27251511
Allow copyTo(short[]), copyFrom(short[]), and their 1D range and 2D
range variants to copy data between short[] arrays and Float16
Allocations.
Change-Id: I370584685c3b773c165bd718974ca736ed548339
(cherry picked from commit
f51bb356deeb8a22414fb44cede4b8618c4b57ba)
Narayan Kamath [Thu, 3 Mar 2016 22:23:37 +0000 (22:23 +0000)]
Track libcore commit
6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
bug:
27426688
Change-Id: I0ac1dd9a1632b42235744602e9384b8049556965
Lajos Molnar [Thu, 3 Mar 2016 17:29:04 +0000 (17:29 +0000)]
Merge "media: correctly return cached size for MediaDataSource"
am:
6ca2cb4991
* commit '
6ca2cb499112871fd840597184dc75ba26fdeae8':
media: correctly return cached size for MediaDataSource
Lajos Molnar [Thu, 3 Mar 2016 17:24:00 +0000 (17:24 +0000)]
Merge "media: correctly return cached size for MediaDataSource"
Dimitry Ivanov [Thu, 3 Mar 2016 17:08:20 +0000 (17:08 +0000)]
Merge "Create linker-namespace for the classloader"
am:
c6b66d3fb7
* commit '
c6b66d3fb763f7ebb9c3946377a3008bad315bc3':
Create linker-namespace for the classloader
Dimitry Ivanov [Thu, 3 Mar 2016 17:05:15 +0000 (17:05 +0000)]
Merge "Create linker-namespace for the classloader"
Lajos Molnar [Thu, 3 Mar 2016 01:03:19 +0000 (17:03 -0800)]
media: correctly return cached size for MediaDataSource
Bug:
27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
Narayan Kamath [Thu, 3 Mar 2016 11:49:15 +0000 (11:49 +0000)]
Narayan Kamath [Thu, 3 Mar 2016 11:43:49 +0000 (11:43 +0000)]
Merge "Track libcore change
2c423c81bfa731df2577a."
Shasidhar Ganiga [Wed, 2 Mar 2016 23:57:28 +0000 (23:57 +0000)]
Merge "Fix for framework reboot on connecting to TV through HDMI."
am:
7585cbfd34
* commit '
7585cbfd34a46bc8332bf066a5d0f69677d3a7e1':
Fix for framework reboot on connecting to TV through HDMI.
Michael Wright [Wed, 2 Mar 2016 23:45:38 +0000 (23:45 +0000)]
Merge "Fix for framework reboot on connecting to TV through HDMI."
George Burgess IV [Wed, 2 Mar 2016 21:34:44 +0000 (13:34 -0800)]
Cleanup uses of sprintf so we can deprecate it.
Change-Id: Ic66abfb547cd5551c47e03d604e65f83c84c597f
Yang Ni [Wed, 2 Mar 2016 18:24:55 +0000 (18:24 +0000)]
Merge "Set flags in RS JNI calls for rsObj creation"
am:
b21cb13010
* commit '
b21cb13010d903e84ed34a94e87a348c891dd587':
Set flags in RS JNI calls for rsObj creation
Yang Ni [Wed, 2 Mar 2016 18:11:08 +0000 (18:11 +0000)]
Merge "Set flags in RS JNI calls for rsObj creation"
Narayan Kamath [Wed, 2 Mar 2016 14:36:59 +0000 (14:36 +0000)]
Narayan Kamath [Wed, 2 Mar 2016 14:30:08 +0000 (14:30 +0000)]
Track libcore change
2c423c81bfa731df2577a.
bug:
27423298
Change-Id: Ibc5094812af4446ac6ff25158ca4dd0ce8271e2a
Narayan Kamath [Wed, 2 Mar 2016 14:14:50 +0000 (14:14 +0000)]
Merge "Track libcore change
2729b8c4d26170."
Narayan Kamath [Wed, 2 Mar 2016 13:35:23 +0000 (13:35 +0000)]
Track libcore change
2729b8c4d26170.
bug:
27423298
Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 15:59:19 +0000 (15:59 +0000)]
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 15:54:59 +0000 (15:54 +0000)]
Przemyslaw Szczepaniak [Mon, 29 Feb 2016 17:23:07 +0000 (17:23 +0000)]
Track libcore change
e42e99816ad6c0626564aaabcf636e8febc1edc6
Change-Id: I7b111ba383751de26c53fcdd8640115d7ddb3890
Deepanshu Gupta [Mon, 29 Feb 2016 10:37:16 +0000 (10:37 +0000)]
Merge changes from topic \'java_8_layoutlib\'
am:
5d5fd21e0a
* commit '
5d5fd21e0aa23662d513825a5054b3b3970b3118':
Switch LayoutLib to Java 8
Move LayoutLib to Java 8
Neil Fuller [Mon, 29 Feb 2016 10:33:29 +0000 (10:33 +0000)]
Merge changes from topic 'java_8_layoutlib'
* changes:
Switch LayoutLib to Java 8
Move LayoutLib to Java 8
Baligh Uddin [Sat, 27 Feb 2016 16:15:28 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Sat, 27 Feb 2016 07:06:47 +0000 (23:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I13a51d705fc1cf7780f67c5c7ff8ef4c232eb8de
Baligh Uddin [Sat, 27 Feb 2016 06:30:39 +0000 (22:30 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Ic252b8bb52174e72afa6c2099e18437f0d464ef7
Dimitry Ivanov [Tue, 23 Feb 2016 22:25:50 +0000 (14:25 -0800)]
Create linker-namespace for the classloader
With this change ApplicationLoaders.getClassLoader()
creates linker-namespace for the classloader at the
construction time. Before this change the namespace
was created on first load of a jni library.
With this change we ensure that every classloader
has initialized namespace associated with it.
As an additional advantage we now can avoid storing
namespace-specific fields in the classloaders.
Bug: http://b/
27189432
Bug: http://b/
22548808
Change-Id: I3b160bd478a55171008682c40b2ebc13bdbd9882
(cherry picked from commit
a55c7f15a3c386ec643f21eeb2f4e9fd7b03ba70)
Nicolas Geoffray [Fri, 26 Feb 2016 14:46:53 +0000 (14:46 +0000)]
Merge "Fix ASAN builds after app_process change."
am:
d21b6420d2
* commit '
d21b6420d2a321168547bee8885b50e598823255':
Fix ASAN builds after app_process change.
Nicolas Geoffray [Fri, 26 Feb 2016 14:45:02 +0000 (14:45 +0000)]
Merge "Fix ASAN builds after app_process change."
Dimitry Ivanov [Fri, 26 Feb 2016 13:37:14 +0000 (13:37 +0000)]
Merge "zygote to preload public native libraries"
am:
38b839ca08
* commit '
38b839ca085f62c5ba06336461e3ae96b849a34e':
zygote to preload public native libraries
Nicolas Geoffray [Fri, 26 Feb 2016 13:16:50 +0000 (13:16 +0000)]
Fix ASAN builds after app_process change.
Bug:
27245894
(cherry picked from commit
573895bbea7cf349d615606004cdb85ba2ca814d)
Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc
Nicolas Geoffray [Fri, 26 Feb 2016 13:33:51 +0000 (13:33 +0000)]
Merge "zygote to preload public native libraries"
Dimitry Ivanov [Mon, 22 Feb 2016 19:22:11 +0000 (11:22 -0800)]
zygote to preload public native libraries
Preload public native libraries when starting a zygote
This lets other users of libnativeloader (like dex2oat)
avoid unnecessary cold loads of libandroid.so which could
take up to a second.
Bug: http://b/
27245894
(cherry picked from commit
b0824979be2653ba300382b52c1b1236fd44f0de)
Change-Id: I04a640c104dba5b585a59d63270e81b6c9ad6f7e
Dimitry Ivanov [Thu, 25 Feb 2016 19:41:00 +0000 (19:41 +0000)]
Merge "Construct classloader for apps with no java code"
am:
33e7677665
* commit '
33e7677665c38507e58245c92101acef01ff302d':
Construct classloader for apps with no java code
Dimitry Ivanov [Thu, 25 Feb 2016 19:35:55 +0000 (19:35 +0000)]
Merge "Construct classloader for apps with no java code"
Baligh Uddin [Thu, 25 Feb 2016 16:21:52 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:50 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:21:06 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:54 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:33 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:30 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:25 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:21 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:17 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:14 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:11 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 25 Feb 2016 16:20:07 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Zhijun He [Wed, 24 Feb 2016 01:56:43 +0000 (01:56 +0000)]
Merge "ImageReader: override the flexible YUV compatible formats"
am:
90804668a8
* commit '
90804668a8a3fcbc661a6fba32737d1468194941':
ImageReader: override the flexible YUV compatible formats
Zhijun He [Wed, 24 Feb 2016 01:46:12 +0000 (01:46 +0000)]
Merge "ImageReader: override the flexible YUV compatible formats"
Dimitry Ivanov [Fri, 19 Feb 2016 22:09:20 +0000 (14:09 -0800)]
Construct classloader for apps with no java code
The commit
6f06ad7df1362e9e5b252689f452bdeee2e5af46
fixed a way to load native library for NativeActivity
by using classloader logic to find the library; which
also fixed the problem of native activity not working
when library is supposed to be opened directly from
the apk.
As a side effect it introduced regression - apps without
java code did not have correctly initialized classloader.
This change fixes this by constructing classloader with
empty dexpath but valid nativeLibrarySearchPath.
Bug: http://b/
26015561
Bug: http://b/
27250344
Change-Id: I50f1119f0976a95edd75d88efb9fcdedc57efbc3
(cherry picked from commit
b9c9026bdd0076014aeca62b088053d8fbce2326)
Pavlin Radoslavov [Tue, 23 Feb 2016 23:53:17 +0000 (23:53 +0000)]
Merge "Suppress output for Protobuf data if Bluetooth is disabled"
am:
b82b7527f1
* commit '
b82b7527f1f65035fbe072a4efff472efec8e046':
Suppress output for Protobuf data if Bluetooth is disabled
Pavlin Radoslavov [Tue, 23 Feb 2016 23:43:33 +0000 (23:43 +0000)]
Merge "Suppress output for Protobuf data if Bluetooth is disabled"
Pavlin Radoslavov [Tue, 23 Feb 2016 19:54:37 +0000 (11:54 -0800)]
Suppress output for Protobuf data if Bluetooth is disabled
If Bluetooth is disabled or there is some other error,
don't print anything when extracting the Metrics-related data
in Protobuf format.
Bug:
27315491
Change-Id: Ic1ec5334fbf0b524909400f080e2eac3ec34edf4
Baligh Uddin [Tue, 23 Feb 2016 22:19:47 +0000 (14:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I2c923a224808511cc59000547e53b8ef4c95919f
Baligh Uddin [Tue, 23 Feb 2016 22:17:33 +0000 (14:17 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Iecd4d12f6df900a2978abd0d7b119a6464f02829
Baligh Uddin [Tue, 23 Feb 2016 22:06:28 +0000 (14:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I2ab41c9ac34bebcb9fb5597b28fe6fef72af4ba8
Baligh Uddin [Tue, 23 Feb 2016 22:04:04 +0000 (14:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I1a94e4773ce5f66035b7abe74dc6646abd519673
Baligh Uddin [Tue, 23 Feb 2016 22:01:32 +0000 (14:01 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I36f817e74605524e482df6b1d4235244d3e4eccb
Baligh Uddin [Tue, 23 Feb 2016 21:55:24 +0000 (13:55 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Id954d41d86d4d9d4b2b1b37befc41f2a123d840e
Baligh Uddin [Tue, 23 Feb 2016 21:52:54 +0000 (13:52 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I2b739d0d7d79a4f1e2bfbd4d7f022f925f1c4a35
Baligh Uddin [Tue, 23 Feb 2016 21:50:40 +0000 (13:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I82803f69253612b40051de2c881d30f3ccbf172b
Baligh Uddin [Tue, 23 Feb 2016 21:48:28 +0000 (13:48 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I194e83727165b74035a0c081817e758b39fc91c4
Baligh Uddin [Tue, 23 Feb 2016 21:46:04 +0000 (13:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Ie9866ed4959a6a29e47ff93f9d66bc25dbb52591
Baligh Uddin [Tue, 23 Feb 2016 21:43:48 +0000 (13:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I1862f022e6a574783534cfac1d8c2f1532ff9d64
Baligh Uddin [Tue, 23 Feb 2016 21:41:25 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I085d5451070ee651d2dd9c78fe2a6c9b0262335d
Baligh Uddin [Tue, 23 Feb 2016 21:39:04 +0000 (13:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I4c9726fd90db16edf63b159d6f02208dbb263d0b
Baligh Uddin [Tue, 23 Feb 2016 21:14:05 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 23 Feb 2016 17:30:30 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Idba6f2455bd0562ba3ef3383ecfc4b5ec370456c
Baligh Uddin [Tue, 23 Feb 2016 17:25:09 +0000 (09:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Ifd8ab81bae90958eeec2e7a6982fef2aea73b7c3
Wale Ogunwale [Tue, 23 Feb 2016 15:39:45 +0000 (15:39 +0000)]
Merge "Make accessing mWaitingForDrawn thread-safe"
am:
f0cf899033
* commit '
f0cf8990330dd592b114374ad15b75bc01f69e47':
Make accessing mWaitingForDrawn thread-safe
Wale Ogunwale [Tue, 23 Feb 2016 15:34:52 +0000 (15:34 +0000)]
Merge "Make accessing mWaitingForDrawn thread-safe"
Jason Monk [Tue, 23 Feb 2016 13:55:28 +0000 (13:55 +0000)]
Merge "Fix NPE in BaseStatusbar in onListenerConnected"
am:
ffef959ca4
* commit '
ffef959ca4e2607a3e4e3f0f23e4aaa3e1b3aafa':
Fix NPE in BaseStatusbar in onListenerConnected
Jason Monk [Tue, 23 Feb 2016 13:51:22 +0000 (13:51 +0000)]
Merge "Fix NPE in BaseStatusbar in onListenerConnected"
tiger_huang [Tue, 23 Feb 2016 12:34:52 +0000 (20:34 +0800)]
Make accessing mWaitingForDrawn thread-safe
mWaitingForDrawn can be accessed by multiple threads, but it was not
protected by the mWindowMap lock perfectly.
Change-Id: I128ba1a00f40af83b051c0d1df4350d0635a9dff