drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
214,375 Commits 1 Branch 0 Tags
Commit Graph

214375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
451ff5a8f3 Merge "Fix VMRuntime.registerAppInfo usage" 2016-03-09 11:57:24 +00:00
Shubham Ajmera
66ca5ac738 Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" 2016-03-09 09:57:17 +00:00
Brian Carlstrom
99de473ea3 Merge "Remove unneeded dependecy on core-tests to fix build" 2016-03-09 03:30:16 +00:00
Brian Carlstrom
73d28418a4 Remove unneeded dependecy on core-tests to fix build 
Bug: 27555885

(cherry picked from commit 2687673025f9b5a86f917135d2a8288d4f31818b)

Change-Id: I6c0aee5c1823b6c498d9306e4a7c749b093e6834
 2016-03-08 17:57:16 -08:00
Yang Ni
814bf25370 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"
 2016-03-08 21:09:11 +00:00
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
ed921692a0 Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d" 
am: 4fa1092c54

* commit '4fa1092c5469ad2ea4fbcc7a0aba08a258a62879':
  Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d
 2016-03-08 19:12:48 +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
Calin Juravle
9036a97847 Fix VMRuntime.registerAppInfo usage 
Partial cherry pick from git commit
d479b52d12fc782f18df6b5ae15c19e022f0ec14

Change-Id: I1de6e7eda23e6029c87896d8c01e063b98e39f74
 2016-03-08 15:49:13 +00:00
Shubham Ajmera
2ff7afd862 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
 2016-03-08 13:19:13 +00:00
Adam Powell
68ab418cb4 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
 2016-03-07 23:50:51 +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
aca700435a Merge "Cleanup uses of sprintf so we can deprecate it." 
am: 5a3ac10568

* commit '5a3ac10568e5d729d604c90117550f253ba4b080':
  Cleanup uses of sprintf so we can deprecate it.
 2016-03-07 22:56:12 +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
8658378382 Merge "Change libraries needed by layoutlib to "host" libs" 
am: 709bf582cf

* commit '709bf582cf949680da976e3f6cd5bf03396b1db1':
  Change libraries needed by layoutlib to "host" libs
 2016-03-04 13:03:48 +00:00
Narayan Kamath
13232345bb Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." 
am: 61d71016a9

* commit '61d71016a9dc6ce61ed7fb251b0e9eb83492140d':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 12:59:47 +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
ff92741c16 Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." 
am: b1bf1cd066

* commit 'b1bf1cd066942c8b775d73396cdc986f776a4b4f':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:47:17 +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
f63ed0f1ca 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
 2016-03-04 00:09:27 +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
11c2eaab97 Merge "media: correctly return cached size for MediaDataSource" 
am: 6ca2cb4991

* commit '6ca2cb499112871fd840597184dc75ba26fdeae8':
  media: correctly return cached size for MediaDataSource
 2016-03-03 17:29:04 +00:00
Lajos Molnar
6ca2cb4991 Merge "media: correctly return cached size for MediaDataSource" 2016-03-03 17:24:01 +00:00
Dimitry Ivanov
0e29efd164 Merge "Create linker-namespace for the classloader" 
am: c6b66d3fb7

* commit 'c6b66d3fb763f7ebb9c3946377a3008bad315bc3':
  Create linker-namespace for the classloader
 2016-03-03 17:08:20 +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
b47dc2032b Merge "Track libcore change 2c423c81bfa731df2577a." 
am: a1fd14328e

* commit 'a1fd14328e990bc23dc5b8447bfe9839a3c7f137':
  Track libcore change 2c423c81bfa731df2577a.
 2016-03-03 11:49:15 +00:00
Narayan Kamath
a1fd14328e Merge "Track libcore change 2c423c81bfa731df2577a." 2016-03-03 11:43:49 +00:00
Shasidhar Ganiga
d3747baad2 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.
 2016-03-02 23:57:28 +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
86feb01288 Merge "Set flags in RS JNI calls for rsObj creation" 
am: b21cb13010

* commit 'b21cb13010d903e84ed34a94e87a348c891dd587':
  Set flags in RS JNI calls for rsObj creation
 2016-03-02 18:24:55 +00:00
Yang Ni
b21cb13010 Merge "Set flags in RS JNI calls for rsObj creation" 2016-03-02 18:11:08 +00:00
Narayan Kamath
9c4b2f6875 Merge "Track libcore change 2729b8c4d26170." 
am: 238e591be6

* commit '238e591be6461f549a8020f4c3924d2a1abf868f':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:36:59 +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
51969bff58 Merge "Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6" 
am: ffa1c08440

* commit 'ffa1c08440c5404d722e69ea59e21103f76323a8':
  Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6
 2016-03-01 15:59:19 +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
Deepanshu Gupta
00b594e5bc Merge changes from topic \'java_8_layoutlib\' 
am: 5d5fd21e0a

* commit '5d5fd21e0aa23662d513825a5054b3b3970b3118':
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
 2016-02-29 10:37:16 +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