213347 Commits

Author SHA1 Message Date
Yang Ni
5a6d9b6656 Merge "Revert "Set flags in RS JNI calls for rsObj creation"" 2016-03-08 21:02:26 +00:00
Yang Ni
8c8daea2ef Revert "Set flags in RS JNI calls for rsObj creation"
This reverts commit ad88055821a7aba3318f066c4e5f87bd0315462c.

Change-Id: I53a3f59022e2607216f4dd89bc2e28e0bd987785
2016-03-08 21:01:54 +00:00
Yi Kong
4fa1092c54 Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d" 2016-03-08 19:09:11 +00:00
Yi Kong
c32718d4b6 Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d
Bug: 27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a
2016-03-08 16:10:49 +00:00
Adam Powell
9d39648de4 Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice" 2016-03-07 23:46:15 +00:00
George Burgess IV
5a3ac10568 Merge "Cleanup uses of sprintf so we can deprecate it." 2016-03-07 22:51:03 +00:00
Neil Fuller
709bf582cf Merge "Change libraries needed by layoutlib to "host" libs" 2016-03-04 12:58:45 +00:00
Narayan Kamath
61d71016a9 Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." 2016-03-04 12:54:59 +00:00
Narayan Kamath
7d18ce744f Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
bug: 27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501
2016-03-04 12:45:05 +00:00
Narayan Kamath
b1bf1cd066 Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." 2016-03-04 12:41:50 +00:00
Neil Fuller
dd24c58f1a 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
2016-03-04 12:01:49 +00:00
Pirama Arumuga Nainar
f033a6ca9f Merge changes I3651e5ae,I37058468
* changes:
  [RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
  [RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
2016-03-04 00:06:04 +00:00
Pirama Arumuga Nainar
1333215d8e [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)
2016-03-03 16:04:57 -08:00
Pirama Arumuga Nainar
5b2a8ab2b4 [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)
2016-03-03 16:01:28 -08:00
Narayan Kamath
de33c660df Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
bug: 27426688
Change-Id: I0ac1dd9a1632b42235744602e9384b8049556965
2016-03-03 22:23:37 +00:00
Lajos Molnar
6ca2cb4991 Merge "media: correctly return cached size for MediaDataSource" 2016-03-03 17:24:01 +00:00
Dimitry Ivanov
c6b66d3fb7 Merge "Create linker-namespace for the classloader" 2016-03-03 17:05:16 +00:00
Lajos Molnar
f78c984e05 media: correctly return cached size for MediaDataSource
Bug: 27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
2016-03-03 08:05:41 -08:00
Narayan Kamath
a1fd14328e Merge "Track libcore change 2c423c81bfa731df2577a." 2016-03-03 11:43:49 +00:00
Michael Wright
7585cbfd34 Merge "Fix for framework reboot on connecting to TV through HDMI." 2016-03-02 23:45:38 +00:00
George Burgess IV
a346f5458a Cleanup uses of sprintf so we can deprecate it.
Change-Id: Ic66abfb547cd5551c47e03d604e65f83c84c597f
2016-03-02 13:34:44 -08:00
Yang Ni
b21cb13010 Merge "Set flags in RS JNI calls for rsObj creation" 2016-03-02 18:11:08 +00:00
Narayan Kamath
a1becdc698 Track libcore change 2c423c81bfa731df2577a.
bug: 27423298
Change-Id: Ibc5094812af4446ac6ff25158ca4dd0ce8271e2a
2016-03-02 14:30:08 +00:00
Narayan Kamath
238e591be6 Merge "Track libcore change 2729b8c4d26170." 2016-03-02 14:14:50 +00:00
Narayan Kamath
b16a96538a Track libcore change 2729b8c4d26170.
bug: 27423298

Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
2016-03-02 13:41:32 +00:00
Przemyslaw Szczepaniak
ffa1c08440 Merge "Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6" 2016-03-01 15:54:59 +00:00
Przemyslaw Szczepaniak
575d1a66f9 Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6
Change-Id: I7b111ba383751de26c53fcdd8640115d7ddb3890
2016-02-29 17:23:07 +00:00
Neil Fuller
5d5fd21e0a Merge changes from topic 'java_8_layoutlib'
* changes:
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:33:29 +00:00
Dimitry Ivanov
ea90281082 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)
2016-02-26 10:16:11 -08:00
Nicolas Geoffray
d21b6420d2 Merge "Fix ASAN builds after app_process change." 2016-02-26 14:45:03 +00:00
Nicolas Geoffray
1da1e5cd3b Fix ASAN builds after app_process change.
Bug:27245894

(cherry picked from commit 573895bbea7cf349d615606004cdb85ba2ca814d)

Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc
2016-02-26 13:36:20 +00:00
Nicolas Geoffray
38b839ca08 Merge "zygote to preload public native libraries" 2016-02-26 13:33:52 +00:00
Dimitry Ivanov
204386e1c5 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
2016-02-26 10:25:06 +00:00
Dimitry Ivanov
33e7677665 Merge "Construct classloader for apps with no java code" 2016-02-25 19:35:55 +00:00
Zhijun He
90804668a8 Merge "ImageReader: override the flexible YUV compatible formats" 2016-02-24 01:46:12 +00:00
Dimitry Ivanov
70b6130db7 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)
2016-02-23 16:09:24 -08:00
Pavlin Radoslavov
b82b7527f1 Merge "Suppress output for Protobuf data if Bluetooth is disabled" 2016-02-23 23:43:34 +00:00
Pavlin Radoslavov
61a94d4777 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
2016-02-23 14:34:58 -08:00
Wale Ogunwale
f0cf899033 Merge "Make accessing mWaitingForDrawn thread-safe" 2016-02-23 15:34:53 +00:00
Jason Monk
ffef959ca4 Merge "Fix NPE in BaseStatusbar in onListenerConnected" 2016-02-23 13:51:22 +00:00
tiger_huang
53d1e66080 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
2016-02-23 20:34:52 +08:00
Neil Fuller
5af6dd5463 Merge "Add stubs needed to enable javac to compile lambdas" 2016-02-23 11:55:09 +00:00
Neil Fuller
613a907045 Add stubs needed to enable javac to compile lambdas
This enables framework.jar code to include lambdas.
framework.jar is still built with javac (as well as
jack) for things like doclava.

Bug: 26753820
(cherry picked from commit 801f90e61b971984c92767acd6fb62d56911664b)

Change-Id: Icdc9e003b09bd1e14e991b32934b3c4c4a268b1a
2016-02-23 10:03:09 +00:00
Kent Persson
185e9c2562 Fix NPE in BaseStatusbar in onListenerConnected
If NotificationListenerService is not bound the
getActiveNotifications function will return null.
This will result in a Nullpointer exception in BaseStatusbar
onListenerConnected if it is called. A Nullpointer check was
added in onListenerConnected to avoid this Nullpointer exception.

Change-Id: I0aec040f11101e8f7b5863879b3774dc2bb6ce2b
2016-02-23 10:36:59 +01:00
Chien-Yu Chen
b999ad9eed Merge "Camera2: Fix getInternalFormatSizes for depth" 2016-02-23 01:10:27 +00:00
Chien-Yu Chen
5f1245b993 Camera2: Fix getInternalFormatSizes for depth
All depth formats are considered as non-high-res. Also compare depth
minimum frame durations instead of regular minimum frame durations
for depth formats.

Bug: 26687093
Change-Id: I65b691fe450077b0e3ace15f6ac0289b41caf42f
2016-02-22 14:29:53 -08:00
Yang Ni
ad88055821 Set flags in RS JNI calls for rsObj creation
Bug: 25570907

Added a flag to all RS runtime API for rsObj creation to indicate a
call is from Java. This flag will help us avoid incrementing the user
ref count for rsObj's created from Single-Source RS, and therefore
avoid memory leaks for such objects.

Change-Id: Id3604f93b166089e3aca896d1c6c509b3ea19bcf
2016-02-22 11:38:54 -08:00
Andreas Gampe
de38445284 Merge "Preload2: Fix object to sync on" 2016-02-22 18:00:50 +00:00
Deepanshu Gupta
fda1ace261 Switch LayoutLib to Java 8
The main build hasn't swtiched to java 8, but lambdas are already used
in layoutlib. This fixes the build break.

(cherry picked from commit 7914e4ca03322427740d6f8c00837375dbf3031a)

Change-Id: Ice5741dcb8b93faf739a3c21f2ed8be95f92ad08
2016-02-22 17:53:37 +00:00
Deepanshu Gupta
c6e35f2e65 Move LayoutLib to Java 8
Partial cherry-pick of commit 491523d52cd8368ef9a92e95fb3e9332bf86a996

Change-Id: Ic64fb20a00ba2ca8b3016f548222729e3f009e9f
2016-02-22 17:49:18 +00:00