OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray"
Pirama Arumuga Nainar [Tue, 29 Mar 2016 03:56:58 +0000 (03:56 +0000)]
Merge "[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray"

8 years ago[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray
Pirama Arumuga Nainar [Mon, 28 Mar 2016 19:00:00 +0000 (12:00 -0700)]
[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray

Bug: http://b/25982676

Instead of returning null from validateObjectIsPrimitiveArray, fail with
an exception.  The callers of this function do not check for null.

Change-Id: Idd2b50a7b137e8d2db7a334bb9a48c1b19ee2403

8 years agoMerge "Address const issues in preparation for libcxx rebase."
Dan Austin [Mon, 28 Mar 2016 21:40:59 +0000 (21:40 +0000)]
Merge "Address const issues in preparation for libcxx rebase."

8 years agoAddress const issues in preparation for libcxx rebase.
Dan Austin [Thu, 24 Mar 2016 19:03:42 +0000 (12:03 -0700)]
Address const issues in preparation for libcxx rebase.

Change-Id: Ia9edf466ab4d1b6cc3f6c6ed86b333e6521c528d

8 years agoMerge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop"
Glenn Kasten [Mon, 28 Mar 2016 14:42:45 +0000 (14:42 +0000)]
Merge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop"

8 years agoMerge "Add OpenJDK Arrays parallelSetAll methods"
Shubham Ajmera [Mon, 28 Mar 2016 10:57:38 +0000 (10:57 +0000)]
Merge "Add OpenJDK Arrays parallelSetAll methods"

8 years agoAdd OpenJDK Arrays parallelSetAll methods
Shubham Ajmera [Fri, 25 Mar 2016 18:31:18 +0000 (18:31 +0000)]
Add OpenJDK Arrays parallelSetAll methods

Adds parallelSetAll(int[], java.util.function.IntUnaryOperator),
parallelSetAll(long[], java.util.function.IntToLongFunction),
parallelSetAll(double[], java.util.function.IntToDoubleFunction),
parallelSetAll(T[], java.util.function.IntFunction<? extends T>)
from the upstream along with the corresponding tests.

Bug: 27540010
Change-Id: Iaa4a0749d8bb95ea8a0072a43bfbd6d6f459ff28

8 years agoMerge "set default journal mode to TRUNCATE, not PERSIST"
Nick Kralevich [Thu, 24 Mar 2016 22:11:47 +0000 (22:11 +0000)]
Merge "set default journal mode to TRUNCATE, not PERSIST"

8 years agoset default journal mode to TRUNCATE, not PERSIST
Daniel Micay [Thu, 24 Mar 2016 03:28:12 +0000 (23:28 -0400)]
set default journal mode to TRUNCATE, not PERSIST

PERSIST causes data to linger in the journal beyond transactions, so
it interacts poorly with SECURE_DELETE. It's also not necessarily
faster, especially since it makes the page cache and SSD cache (if there
is one) colder by holding on to blocks that are no longer used.

The default chosen by upstream is DELETE, but TRUNCATE is a bit lighter
since it doesn't need to create/delete the file.

Change-Id: If790271c253a840df241980f538fc0d844ba7857

8 years agoMerge "Remove custom copy rules, stop using ACP"
Dan Willemsen [Wed, 23 Mar 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Remove custom copy rules, stop using ACP"

8 years agoMerge "Use canonical name for SHA1withECDSA"
Kenny Root [Wed, 23 Mar 2016 21:29:00 +0000 (21:29 +0000)]
Merge "Use canonical name for SHA1withECDSA"

8 years agoRemove custom copy rules, stop using ACP
Dan Willemsen [Wed, 23 Mar 2016 07:42:44 +0000 (00:42 -0700)]
Remove custom copy rules, stop using ACP

Replace some custom rules with BUILD_PREBUILT.

Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.

Remove uses of ACP and replace with core build system macros or 'cp'

Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141

8 years agoUse canonical name for SHA1withECDSA
Kenny Root [Wed, 23 Mar 2016 15:52:25 +0000 (08:52 -0700)]
Use canonical name for SHA1withECDSA

The Standard Names documentation says that "ECDSA" should not be used
due to its ambiguity. Bouncycastle has switched from "ECDSA" to
"SHA1withECDSA" so therefore we should switch this "workaround" Provider
to use the same name to keep it functioning correctly.

Bug: 27753949
Change-Id: I5acfca9d89c85bf005902a2f06cb5d7b1ef9dff2

8 years agoMerge "Enable shader cache for applications that shared UID with multiple packages...
John Reck [Tue, 22 Mar 2016 14:25:35 +0000 (14:25 +0000)]
Merge "Enable shader cache for applications that shared UID with multiple packages too"

8 years agoMerge "Use handles to identify GATT attributes (4/4)"
Andre Eisenbach [Tue, 22 Mar 2016 02:35:57 +0000 (02:35 +0000)]
Merge "Use handles to identify GATT attributes (4/4)"

8 years agoUse handles to identify GATT attributes (4/4)
Jakub Pawlowski [Thu, 17 Mar 2016 23:00:16 +0000 (16:00 -0700)]
Use handles to identify GATT attributes (4/4)

Bug: 27778668
Change-Id: I01e095939df2f8dc433f14b473957c815ecade74

8 years agoMerge "Changes of root storage space unmounting time on Zygote Process"
Elliott Hughes [Mon, 21 Mar 2016 21:06:09 +0000 (21:06 +0000)]
Merge "Changes of root storage space unmounting time on Zygote Process"

8 years agoMerge "Correctly init code cache path for RS"
Yang Ni [Mon, 21 Mar 2016 19:58:24 +0000 (19:58 +0000)]
Merge "Correctly init code cache path for RS"

8 years agoMerge "JobScheduler: handle connectivity action in bg looper"
Chris Tate [Mon, 21 Mar 2016 19:34:00 +0000 (19:34 +0000)]
Merge "JobScheduler: handle connectivity action in bg looper"

8 years agoEnable shader cache for applications that shared UID with multiple packages too
Shuo Gao [Tue, 1 Mar 2016 05:32:03 +0000 (13:32 +0800)]
Enable shader cache for applications that shared UID with multiple packages too

Frameworks supported a mature mechanism for shader cache per each package already,
but as a special case such as Settings APP, if there are several packages in this
application which means that multiple packages shared the same SharedUserID with it,
it won't initialize the graphics disk caches, thereby APP like Settings have to
rebuild and relink shader every time during launch, which cause a bad launching
performance, so here to enable the GFX and RS cache initialization for multiple
shared packages case too.

Change-Id: If0f927e3399b775804abf1d9a868887951f471c5
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
8 years agoMerge "Make BluetoothManagerCallback oneway to prevent waiting on response"
Ajay Panicker [Sat, 19 Mar 2016 00:08:26 +0000 (00:08 +0000)]
Merge "Make BluetoothManagerCallback oneway to prevent waiting on response"

8 years agoCorrectly init code cache path for RS
Yang Ni [Fri, 11 Mar 2016 00:12:31 +0000 (16:12 -0800)]
Correctly init code cache path for RS

Bug: 27439261

Script Group needs to know the code cache path before it can call bcc to
merge kernels. However, before this change, the code cache path has been
initialized by the ScriptC class.

In the case where a script group (or even the entire app) does not contain any
regular script but only intrinsics, the code cache would remain uninitialized.

Fixed this by initializing the code cache path in the RenderScript class
the first time when the accessor method is called.

Change-Id: I87f9e62e0f3b479f94e43daa3e9695a5b38710db

8 years agoMake BluetoothManagerCallback oneway to prevent waiting on response
Ajay Panicker [Fri, 18 Mar 2016 22:38:20 +0000 (15:38 -0700)]
Make BluetoothManagerCallback oneway to prevent waiting on response

Bug: 27384453
Change-Id: I2cd0f1bc03c7a1e887c89faa18d5baa6ca5be24a

8 years agoMerge "Change how services are passed up to the stack"
Andre Eisenbach [Fri, 18 Mar 2016 22:11:51 +0000 (22:11 +0000)]
Merge "Change how services are passed up to the stack"

8 years agoMerge "Switch frameworks/base/core/jni from gcc to clang."
Stephen Hines [Fri, 18 Mar 2016 21:32:08 +0000 (21:32 +0000)]
Merge "Switch frameworks/base/core/jni from gcc to clang."

8 years agoChange how services are passed up to the stack
Jakub Pawlowski [Wed, 2 Mar 2016 02:50:27 +0000 (18:50 -0800)]
Change how services are passed up to the stack

Right now we pass all services, characteristics and descriptors one by one.
This patch changes that - now we pass whole GATT database at once.

Bug: 27455533
Change-Id: Ie42cd80072538e411904b9c9b011a978f26158b9

8 years agoMerge "Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde"
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 14:40:43 +0000 (14:40 +0000)]
Merge "Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde"

8 years agoTrack libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 13:58:43 +0000 (13:58 +0000)]
Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde

Bug: 27692239
Change-Id: I43fee87bed4744c36660b28a03915ecd5dfce272

8 years agoMerge "Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c"
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 12:44:30 +0000 (12:44 +0000)]
Merge "Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c"

8 years agoJobScheduler: handle connectivity action in bg looper
wangshujie [Wed, 16 Mar 2016 07:20:04 +0000 (15:20 +0800)]
JobScheduler: handle connectivity action in bg looper

in rare cases InputDispatcher relies on the SystemServer to enqueue
the input events and wake it up (eg. with some accessibility services
enabled which have their own inputfilters).Receivers in the main thread
may block events dispatching and then we will peceive jank in windows.

issue: https://code.google.com/p/android/issues/detail?id=204067

Change-Id: I1f47cc5cb8fb2b2aa0cee7a8ed4bf50efb81e477
Signed-off-by: wangshujie <wangshujie@xiaomi.com>
8 years agoSwitch frameworks/base/core/jni from gcc to clang.
Ben Wagner [Thu, 17 Mar 2016 21:31:40 +0000 (17:31 -0400)]
Switch frameworks/base/core/jni from gcc to clang.

Bug: http://b/22414716

Change-Id: If77628daf4e621008cda96645a9fffbf0fba4992

8 years agoMerge "Renamed the function initialing nativeloader"
Dimitry Ivanov [Thu, 17 Mar 2016 22:53:57 +0000 (22:53 +0000)]
Merge "Renamed the function initialing nativeloader"

8 years agoRenamed the function initialing nativeloader
Dimitry Ivanov [Wed, 16 Mar 2016 21:15:11 +0000 (14:15 -0700)]
Renamed the function initialing nativeloader

Bug: http://b/27546414
Change-Id: Ia0b65540772ca4bd1cdab391973325b18cd278a0
(cherry picked from commit bf1082e9a1ae833718321ac58ab64e281d0e3614)

8 years agoMerge "Port OpenJDK 8 java.util.Arrays#setAll methods"
Shubham Ajmera [Thu, 17 Mar 2016 16:57:45 +0000 (16:57 +0000)]
Merge "Port OpenJDK 8 java.util.Arrays#setAll methods"

8 years agoPort OpenJDK 8 java.util.Arrays#setAll methods
Shubham Ajmera [Thu, 17 Mar 2016 16:24:52 +0000 (16:24 +0000)]
Port OpenJDK 8 java.util.Arrays#setAll methods

and add tests

Bug: 27540010
Change-Id: I18f502caabc2f140fa503a0b03e9d6e310b4246c

8 years agoMerge "Remove the field of MediaDrm from inner class CryptoSession."
Marco Nelissen [Thu, 17 Mar 2016 15:43:32 +0000 (15:43 +0000)]
Merge "Remove the field of MediaDrm from inner class CryptoSession."

8 years agoMerge "Do not scan a file which cannot be read"
Marco Nelissen [Thu, 17 Mar 2016 15:42:02 +0000 (15:42 +0000)]
Merge "Do not scan a file which cannot be read"

8 years agoMerge "Fix broken StringBuilder construction."
Ian Rogers [Wed, 16 Mar 2016 23:58:45 +0000 (23:58 +0000)]
Merge "Fix broken StringBuilder construction."

8 years agoFix broken StringBuilder construction.
Ian Rogers [Wed, 16 Mar 2016 19:14:55 +0000 (12:14 -0700)]
Fix broken StringBuilder construction.

StringBuilder doesn't have a char constructor and so passing a char calls the
int constructor that presizes the StringBuilder rather than creating it
containing a single character.
This bug was caught by error prone.

Change-Id: I809ce0fcf930688db925ac7a8e23ee85086d479e

8 years agoMerge "[DO NOT MERGE] Add flag to "am start" to enable native debugging"
David Srbecky [Wed, 16 Mar 2016 17:11:09 +0000 (17:11 +0000)]
Merge "[DO NOT MERGE] Add flag to "am start" to enable native debugging"

8 years agoTrack libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 14:46:08 +0000 (14:46 +0000)]
Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c

Bug: 27692239
Change-Id: I30cee355ecae2596c57d5325890c03e4a3f293ca

8 years agoMerge "Extra generic type information to aid certain javacs."
Ian Rogers [Wed, 16 Mar 2016 15:41:35 +0000 (15:41 +0000)]
Merge "Extra generic type information to aid certain javacs."

8 years agoMerge "Use proper ScriptCall size in nScriptForEach()"
Yang Ni [Wed, 16 Mar 2016 15:19:24 +0000 (15:19 +0000)]
Merge "Use proper ScriptCall size in nScriptForEach()"

8 years agoMerge "Track libcore commit da61c6a1478cd1a14f3e654460292228f4f15e88"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:19:31 +0000 (13:19 +0000)]
Merge "Track libcore commit da61c6a1478cd1a14f3e654460292228f4f15e88"

8 years agoTrack libcore commit da61c6a1478cd1a14f3e654460292228f4f15e88
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 11:23:34 +0000 (11:23 +0000)]
Track libcore commit da61c6a1478cd1a14f3e654460292228f4f15e88

Bug: 27426599
Change-Id: Ia7a00fe975e84ff0dff96d427d089fc26815c2f5

8 years agoExtra generic type information to aid certain javacs.
Ian Rogers [Wed, 16 Mar 2016 04:09:40 +0000 (21:09 -0700)]
Extra generic type information to aid certain javacs.

In particular this is needed for the code to compile using the error prone
analyzer.

Change-Id: I09904705ced909ead750cb30d0f96c994132a51c

8 years agoUse proper ScriptCall size in nScriptForEach()
Yang Ni [Tue, 15 Mar 2016 23:00:02 +0000 (16:00 -0700)]
Use proper ScriptCall size in nScriptForEach()

Bug: 26498479

Although the size of struct ScriptCall is not used underneath in the
runtime or drivers, assign the correct value here to avoid confusion.

Change-Id: I8db19538b9f70f3bf9ee849a8724da3d9ee04785

8 years agoMerge "Close notification panel when user button is tapped"
Adrian Roos [Tue, 15 Mar 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Close notification panel when user button is tapped"

8 years agoMerge "Track libcore commit d41ca4a76ea570f9dd89a7ae56410cc75cc0a856"
Yi Kong [Tue, 15 Mar 2016 17:05:24 +0000 (17:05 +0000)]
Merge "Track libcore commit d41ca4a76ea570f9dd89a7ae56410cc75cc0a856"

8 years agoMerge "Add short codes for DCB to free UK and 44567 to standard US."
Robert Greenwalt [Tue, 15 Mar 2016 16:40:15 +0000 (16:40 +0000)]
Merge "Add short codes for DCB to free UK and 44567 to standard US."

8 years agoTrack libcore commit d41ca4a76ea570f9dd89a7ae56410cc75cc0a856
Yi Kong [Tue, 15 Mar 2016 15:45:07 +0000 (15:45 +0000)]
Track libcore commit d41ca4a76ea570f9dd89a7ae56410cc75cc0a856

Bug: 27538943
Change-Id: I91fc2e9738dcfb7be061041b5e000b21e7684184

8 years agoMerge "Track libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab"
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:23:34 +0000 (13:23 +0000)]
Merge "Track libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab"

8 years agoTrack libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:04:20 +0000 (13:04 +0000)]
Track libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab

Bug: 27426684
Change-Id: I95b19ab738ff05996830c5429367d31ba0d257ba

8 years agoMerge "Track libcore commit 05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c"
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:47:07 +0000 (10:47 +0000)]
Merge "Track libcore commit 05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c"

8 years agoTrack libcore commit 05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:22:01 +0000 (10:22 +0000)]
Track libcore commit 05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c

Bug: 27426599
Change-Id: I9127856e82a16b891adcdb4e0e841ab2f3a85989

8 years agoAdd short codes for DCB to free UK and 44567 to standard US.
Vasco Brito [Mon, 14 Mar 2016 14:29:39 +0000 (14:29 +0000)]
Add short codes for DCB to free UK and 44567 to standard US.

UK short codes are used by Direct Carrier Billing (DCB) on
Google Play. US short code excludes the Google Wallet dedicated
short code (being used by the Google Wallet team to send
notifications to users) from premium phone numbers.

Change-Id: Idea06bb773d054b9cdc87fad51a428dde1ab83fe
Signed-off-by: Vasco Brito <vascob@google.com>
8 years ago[DO NOT MERGE] Add flag to "am start" to enable native debugging
Tamas Berghammer [Fri, 29 Jan 2016 12:07:00 +0000 (12:07 +0000)]
[DO NOT MERGE] Add flag to "am start" to enable native debugging

[Backported form internal CL854980]

Specifying the new flag will enable several features in the runtime
required by the native debugger to debug Java and C++ code at the same
time.

The enabled features:
* Force JIT (never use the interpreter)
* Debug info generation
* Disable some optimizations

Change-Id: Iaf5ab649715a0c274bd1b0fc64e483705da53cd0

8 years agoMerge "Fix some errors in errorCalculator.rs."
Stephen Hines [Thu, 10 Mar 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix some errors in errorCalculator.rs."

8 years agoMerge "Fix build broken by dfce17570e74e94404395a802."
Narayan Kamath [Thu, 10 Mar 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Fix build broken by dfce17570e74e94404395a802."

8 years agoFix build broken by dfce17570e74e94404395a802.
Narayan Kamath [Thu, 10 Mar 2016 17:41:47 +0000 (17:41 +0000)]
Fix build broken by dfce17570e74e94404395a802.

Change-Id: I2d6f944193919f19774f53db0678fa032878b396

8 years agoMerge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc."
Narayan Kamath [Thu, 10 Mar 2016 17:39:33 +0000 (17:39 +0000)]
Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc."

8 years agoMerge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"
Yi Kong [Thu, 10 Mar 2016 16:50:02 +0000 (16:50 +0000)]
Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"

8 years agoTrack libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
Narayan Kamath [Sat, 5 Mar 2016 11:04:19 +0000 (11:04 +0000)]
Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.

bug: 27426688

Change-Id: I6419f2b846932cd089efee1e74400fba97992c92

8 years agoTrack libcore change b695412b529c8dced105867c6d9d7fd463a67714
Yi Kong [Wed, 9 Mar 2016 15:01:04 +0000 (15:01 +0000)]
Track libcore change b695412b529c8dced105867c6d9d7fd463a67714

Bug: 27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1

8 years agoMerge "fix SeekBarPreference support for summaries"
Alan Viverette [Thu, 10 Mar 2016 15:24:13 +0000 (15:24 +0000)]
Merge "fix SeekBarPreference support for summaries"

8 years agofix SeekBarPreference support for summaries
Daniel Micay [Thu, 10 Mar 2016 01:56:56 +0000 (20:56 -0500)]
fix SeekBarPreference support for summaries

Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.

Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57

8 years agoMerge "Don't crash if we get a DHCP packet with the wrong port."
Lorenzo Colitti [Thu, 10 Mar 2016 02:29:09 +0000 (02:29 +0000)]
Merge "Don't crash if we get a DHCP packet with the wrong port."

8 years agoFix some errors in errorCalculator.rs.
Stephen Hines [Thu, 10 Mar 2016 00:42:40 +0000 (16:42 -0800)]
Fix some errors in errorCalculator.rs.

Bug: http://b/26987366

This code was accidentally casting a uchar4 to a single integer, which
the latest llvm-rs-cc will flag as an error. The comparison was also
incorrectly using a single integer comparison, instead of looking at all
4 uchar vector components.

Change-Id: Id680d642cb0079461429f3910343c6dbe8d488ef

8 years agoMerge "Parse "vendor/priv-app" to find privileged applications"
Todd Kennedy [Wed, 9 Mar 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications"

8 years agoMerge "Update DexFile.getDexOptNeeded in framework"
Calin Juravle [Wed, 9 Mar 2016 11:57:36 +0000 (11:57 +0000)]
Merge "Update DexFile.getDexOptNeeded in framework"

8 years agoMerge "Fix VMRuntime.registerAppInfo usage"
Calin Juravle [Wed, 9 Mar 2016 11:57:23 +0000 (11:57 +0000)]
Merge "Fix VMRuntime.registerAppInfo usage"

8 years agoMerge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"
Shubham Ajmera [Wed, 9 Mar 2016 09:57:16 +0000 (09:57 +0000)]
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"

8 years agoDon't crash if we get a DHCP packet with the wrong port.
Lorenzo Colitti [Wed, 2 Mar 2016 04:31:52 +0000 (13:31 +0900)]
Don't crash if we get a DHCP packet with the wrong port.

This should only happen if we get a packet in the small time
window between binding the packet socket and programming the
BPF filter on it.

Bug: 26696823
Change-Id: I481f1bc74bbaeb9646d96e1841d2a69acdb47d62

8 years agoMerge "Remove unneeded dependecy on core-tests to fix build"
Brian Carlstrom [Wed, 9 Mar 2016 03:30:16 +0000 (03:30 +0000)]
Merge "Remove unneeded dependecy on core-tests to fix build"

8 years agoRemove 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

8 years agoMerge "Revert "Set flags in RS JNI calls for rsObj creation""
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"

8 years agoMerge "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""

8 years agoRevert "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

8 years agoMerge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"
Yi Kong [Tue, 8 Mar 2016 19:12:48 +0000 (19:12 +0000)]
Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"
am: 4fa1092c54

* commit '4fa1092c5469ad2ea4fbcc7a0aba08a258a62879':
  Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d

8 years agoMerge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"
Yi Kong [Tue, 8 Mar 2016 19:09:10 +0000 (19:09 +0000)]
Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"

8 years agoTrack libcore change f121f31fd91c5a557225cd6a97418e716529eb2d
Yi Kong [Tue, 8 Mar 2016 09:21:18 +0000 (09:21 +0000)]
Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d

Bug: 27427010
Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a

8 years agoUpdate DexFile.getDexOptNeeded in framework
Calin Juravle [Tue, 8 Mar 2016 15:50:19 +0000 (15:50 +0000)]
Update DexFile.getDexOptNeeded in framework

Partial cherry pick from commit 693f997cc8b8c2ba8d3ed29627b2641dd86392a5

Change-Id: I0fe34541e3cf77fb6e6dbe689b7cf55cb78dbe05

8 years agoFix VMRuntime.registerAppInfo usage
Calin Juravle [Tue, 8 Mar 2016 13:58:18 +0000 (13:58 +0000)]
Fix VMRuntime.registerAppInfo usage

Partial cherry pick from git commit
d479b52d12fc782f18df6b5ae15c19e022f0ec14

Change-Id: I1de6e7eda23e6029c87896d8c01e063b98e39f74

8 years agoPort OpenJDK8 java.util.*SummaryStatistics & add tests
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

8 years agoMerge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"
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

8 years agoMerge "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"

8 years agoMerge "Cleanup uses of sprintf so we can deprecate it."
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.

8 years agoMerge "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."

8 years agoMerge "Change libraries needed by layoutlib to "host" libs"
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

8 years agoMerge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."
Narayan Kamath [Fri, 4 Mar 2016 12:59:47 +0000 (12:59 +0000)]
Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."
am: 61d71016a9

* commit '61d71016a9dc6ce61ed7fb251b0e9eb83492140d':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.

8 years agoMerge "Change libraries needed by layoutlib to "host" libs"
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Change libraries needed by layoutlib to "host" libs"

8 years agoMerge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."
Narayan Kamath [Fri, 4 Mar 2016 12:54:59 +0000 (12:54 +0000)]
Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."

8 years agoMerge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."
Narayan Kamath [Fri, 4 Mar 2016 12:47:17 +0000 (12:47 +0000)]
Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."
am: b1bf1cd066

* commit 'b1bf1cd066942c8b775d73396cdc986f776a4b4f':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.

8 years agoTrack libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
Narayan Kamath [Thu, 3 Mar 2016 22:35:46 +0000 (22:35 +0000)]
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.

bug: 27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501

8 years agoMerge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."
Narayan Kamath [Fri, 4 Mar 2016 12:41:50 +0000 (12:41 +0000)]
Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."

8 years agoChange libraries needed by layoutlib to "host" libs
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

8 years agoMerge changes I3651e5ae,I37058468
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

8 years agoMerge changes I3651e5ae,I37058468
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

8 years ago[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16
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)

8 years ago[RenderScript] Allow copyTo(short[]) etc for Float16 Allocations
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)