OSDN Git Service
Yi Kong [Fri, 1 Apr 2016 12:59:01 +0000 (12:59 +0000)]
Andre Eisenbach [Fri, 1 Apr 2016 00:18:47 +0000 (00:18 +0000)]
Merge "Always use Write Request for GATT descriptor writes"
Andre Eisenbach [Fri, 1 Apr 2016 00:18:31 +0000 (00:18 +0000)]
Merge "Fix log spam in getCharacteristicById()"
Yang Ni [Thu, 31 Mar 2016 22:56:37 +0000 (22:56 +0000)]
Merge "Added CloseGuard for BaseObj"
Yang Ni [Thu, 24 Mar 2016 16:40:32 +0000 (09:40 -0700)]
Added CloseGuard for BaseObj
Bug:
27719830
To turn on warnings, apps have to add to their Activity.onCreate() method
the following code.
StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
.detectLeakedClosableObjects()
.penaltyLog()
.build());
For Slang generated ScriptC derived classes, we assume their
constructors won't throw exceptions after calling the ScriptC
constructor. In addition, ScriptIntrinsic derived classes do not seem
to throw exceptions in their constructors either. Therefore, we can
leave the guard.open() call in the Script constructor. This may be
only an approximation, but allows us to add CloseGuard for script
objects without making changes to slang.
Change-Id: I77ed45239a60b85af5c811dee6c124fb53da9060
Andre Eisenbach [Wed, 30 Mar 2016 01:55:57 +0000 (18:55 -0700)]
Fix log spam in getCharacteristicById()
Bug:
27744135
Change-Id: I43f6358484729dedd85eb52432ad9805a66ff81e
Andre Eisenbach [Wed, 30 Mar 2016 03:52:38 +0000 (20:52 -0700)]
Always use Write Request for GATT descriptor writes
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used used
for this sub-procedure".
Change-Id: I86e4e1d3a8bfd7d78dfed8419f8abd2d7e89b2bc
Ying Wang [Thu, 31 Mar 2016 16:53:12 +0000 (16:53 +0000)]
Merge "Remove support of disabling Jack."
Yi Kong [Thu, 31 Mar 2016 16:35:59 +0000 (17:35 +0100)]
Track libcore change
5731615b4d705b5af63a3126d84b8786862477d.
bug:
26689841
Change-Id: I463543c67cc525583d1fd6f7031a0d38f543d8a2
(cherry picked from commit
64aebdc02b36c1ed4caa618b1d95e726f8823ac1)
Yi Kong [Thu, 31 Mar 2016 16:15:15 +0000 (16:15 +0000)]
Yi Kong [Thu, 31 Mar 2016 15:17:40 +0000 (16:17 +0100)]
Track libcore change
9b7cfceb7b825835730f7977d4935dec3ff1a3be
Bug:
27762555
Change-Id: I03984f4319ba21976078b2b3dff1a857eb5ebd0a
Ying Wang [Wed, 30 Mar 2016 20:58:10 +0000 (13:58 -0700)]
Remove support of disabling Jack.
Also removed obsolete LOCAL_DX_FLAGS.
Bug:
27400061
Change-Id: I23fe13927fb3580698a8a4b84173e229e037f02e
Brian Carlstrom [Wed, 30 Mar 2016 20:31:01 +0000 (20:31 +0000)]
Merge "Fix typo in Conversion Functions doc"
Brian Carlstrom [Tue, 29 Mar 2016 21:49:09 +0000 (14:49 -0700)]
Fix typo in Conversion Functions doc
Bug:
27529815
(cherry picked from commit
b61a0dae0923f17089a894ea959a87a91cd12f9f)
Change-Id: I401531a469f8ea01175d738e1cb4a02a064c9194
Miao Wang [Wed, 30 Mar 2016 01:02:28 +0000 (01:02 +0000)]
Merge changes Iaa88ac02,Ic6f8d1da,Idd07db5d
* changes:
[RenderScript] Update documentation for Allocation.setAutoPadding().
[RenderScript] Fix IntrinsicConvolve documentation.
[RenderScript] Update the documentation of Script.LaunchOptions
Miao Wang [Tue, 29 Mar 2016 22:56:55 +0000 (15:56 -0700)]
[RenderScript] Update documentation for Allocation.setAutoPadding().
Bug:
26862970
Change-Id: Iaa88ac0266e5d2cac2837f1d13353aacc6177274
(cherry picked from commit
9ee7607615563c6b480968470e69cb58d0996cb8)
Miao Wang [Tue, 29 Mar 2016 22:29:10 +0000 (15:29 -0700)]
[RenderScript] Fix IntrinsicConvolve documentation.
Bug:
25117120
- Better format.
- Typo fixes.
Change-Id: Ic6f8d1dacecdaf9993dd8298de7a801f5fd2a937
(cherry picked from commit
3d23dce43330b9c8f3fba34ef9515dca7912768a)
Miao Wang [Tue, 29 Mar 2016 22:14:21 +0000 (15:14 -0700)]
[RenderScript] Update the documentation of Script.LaunchOptions
Bug:
26916665
- Add description of the endArg.
- Update the example.
- Update the incorrect description.
Change-Id: Idd07db5d790e2d6462fff9cb580115ec45cfd4f0
(cherry picked from commit
53fdcfbe63c1d4b2f1cbee6e72a6dd13f41dc1bc)
Robert Greenwalt [Tue, 29 Mar 2016 22:39:53 +0000 (22:39 +0000)]
Merge "When wifi ssid is empty, return WifiSsid.NONE"
Andreas Gampe [Tue, 29 Mar 2016 21:24:18 +0000 (21:24 +0000)]
Merge "Frameworks/base: Refactor package manager"
Adam Lesinski [Tue, 29 Mar 2016 18:24:39 +0000 (18:24 +0000)]
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
Andreas Gampe [Tue, 29 Mar 2016 17:52:33 +0000 (10:52 -0700)]
Frameworks/base: Refactor package manager
Minimal cherry-pick to keep things alive.
Bug:
27689078
(cherry picked from commit
bdd30d86ef98456161069d11481b2ccd25a11b4e)
Change-Id: I06b9d75f58c59cb07ef5170f784ea6745168efaa
Shubham Ajmera [Tue, 29 Mar 2016 15:02:25 +0000 (15:02 +0000)]
Merge "Add OpenJDK 8 java.util.List Default Methods"
Shubham Ajmera [Tue, 29 Mar 2016 14:59:33 +0000 (14:59 +0000)]
Merge "Port OpenJDK8 changes in java.util.Map"
Benjamin Franz [Tue, 29 Mar 2016 14:09:31 +0000 (14:09 +0000)]
Merge "Fix incorrect behavior for statusbar and quicksettings panel"
Shubham Ajmera [Tue, 29 Mar 2016 14:03:23 +0000 (15:03 +0100)]
Add OpenJDK 8 java.util.List Default Methods
and corresponding tests.
Added replaceAll and sort methods from the upstream except for the
CopyOnWriteArrayList.
Added forEach method along with the above two methods in
CopyOnWriteArrayList.
Bug:
27693350
Bug:
27540008
Change-Id: I9efbd66b65c06b50fc20f63d477c25a05a8fae02
Shubham Ajmera [Tue, 29 Mar 2016 13:49:45 +0000 (14:49 +0100)]
Port OpenJDK8 changes in java.util.Map
& add tests.
The CL add tests for map default methods added in Java 8 - getOrDefault,
putIfAbsent, remove(K, V), replace(K, V, V), replace(K, V), forEach,
replaceAll, compute, computeIfAbsent, computeIfPresent, putIfAbsent,
merge.
Methods have been made synchronzed in Hashtable. They are using the
default map methods instead of taking the upstream changes.
Replace(K, V, V) in LinkedHashMap has been overridden as it doesn't
record access when the replace method doesn't make any replacement.
Bug:
27426743
Change-Id: Ie27ea5bd42ddbfa751b89f9eacfb290a3d69f4bb
Pirama Arumuga Nainar [Tue, 29 Mar 2016 03:56:58 +0000 (03:56 +0000)]
Merge "[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
Dan Austin [Mon, 28 Mar 2016 21:40:59 +0000 (21:40 +0000)]
Merge "Address 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
Glenn Kasten [Mon, 28 Mar 2016 14:42:45 +0000 (14:42 +0000)]
Merge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop"
Shubham Ajmera [Mon, 28 Mar 2016 10:57:38 +0000 (10:57 +0000)]
Merge "Add 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
Nick Kralevich [Thu, 24 Mar 2016 22:11:47 +0000 (22:11 +0000)]
Merge "set 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
Dan Willemsen [Wed, 23 Mar 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Remove custom copy rules, stop using ACP"
Kenny Root [Wed, 23 Mar 2016 21:29:00 +0000 (21:29 +0000)]
Merge "Use canonical name for SHA1withECDSA"
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
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
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"
Yinlin Cai [Thu, 26 Nov 2015 06:46:16 +0000 (14:46 +0800)]
Fix incorrect behavior for statusbar and quicksettings panel
Incorrectly disableForUser() is called in disable2().
Use disable2ForUser() instead of disableForUser().
Bug:
27688623
Change-Id: Iadb6aec82ccfe95a90e4a3d212fbd14d73093982
Andre Eisenbach [Tue, 22 Mar 2016 02:35:57 +0000 (02:35 +0000)]
Merge "Use 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
Elliott Hughes [Mon, 21 Mar 2016 21:06:09 +0000 (21:06 +0000)]
Merge "Changes of root storage space unmounting time on Zygote Process"
Yang Ni [Mon, 21 Mar 2016 19:58:24 +0000 (19:58 +0000)]
Merge "Correctly init code cache path for RS"
Chris Tate [Mon, 21 Mar 2016 19:34:00 +0000 (19:34 +0000)]
Merge "JobScheduler: handle connectivity action in bg looper"
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>
Ajay Panicker [Sat, 19 Mar 2016 00:08:26 +0000 (00:08 +0000)]
Merge "Make BluetoothManagerCallback oneway to prevent waiting on response"
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
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
Andre Eisenbach [Fri, 18 Mar 2016 22:11:51 +0000 (22:11 +0000)]
Merge "Change how services are passed up to the stack"
Stephen Hines [Fri, 18 Mar 2016 21:32:08 +0000 (21:32 +0000)]
Merge "Switch frameworks/base/core/jni from gcc to clang."
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
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 14:40:43 +0000 (14:40 +0000)]
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 13:58:43 +0000 (13:58 +0000)]
Track libcore change
848cf2e74b74b68c99b7b0a432263c3e57433fde
Bug:
27692239
Change-Id: I43fee87bed4744c36660b28a03915ecd5dfce272
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 12:44:30 +0000 (12:44 +0000)]
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>
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
Dimitry Ivanov [Thu, 17 Mar 2016 22:53:57 +0000 (22:53 +0000)]
Merge "Renamed 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)
Shubham Ajmera [Thu, 17 Mar 2016 16:57:45 +0000 (16:57 +0000)]
Merge "Port 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
Marco Nelissen [Thu, 17 Mar 2016 15:43:32 +0000 (15:43 +0000)]
Merge "Remove the field of MediaDrm from inner class CryptoSession."
Marco Nelissen [Thu, 17 Mar 2016 15:42:02 +0000 (15:42 +0000)]
Merge "Do not scan a file which cannot be read"
Ian Rogers [Wed, 16 Mar 2016 23:58:45 +0000 (23:58 +0000)]
Merge "Fix 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
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"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 14:46:08 +0000 (14:46 +0000)]
Track libcore change
336ffbe1f2870fef47f8e80da87c80d7e379b69c
Bug:
27692239
Change-Id: I30cee355ecae2596c57d5325890c03e4a3f293ca
Ian Rogers [Wed, 16 Mar 2016 15:41:35 +0000 (15:41 +0000)]
Merge "Extra generic type information to aid certain javacs."
Yang Ni [Wed, 16 Mar 2016 15:19:24 +0000 (15:19 +0000)]
Merge "Use proper ScriptCall size in nScriptForEach()"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:19:31 +0000 (13:19 +0000)]
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 11:23:34 +0000 (11:23 +0000)]
Track libcore commit
da61c6a1478cd1a14f3e654460292228f4f15e88
Bug:
27426599
Change-Id: Ia7a00fe975e84ff0dff96d427d089fc26815c2f5
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
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
Adrian Roos [Tue, 15 Mar 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Close notification panel when user button is tapped"
Yi Kong [Tue, 15 Mar 2016 17:05:24 +0000 (17:05 +0000)]
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."
Yi Kong [Tue, 15 Mar 2016 15:45:07 +0000 (15:45 +0000)]
Track libcore commit
d41ca4a76ea570f9dd89a7ae56410cc75cc0a856
Bug:
27538943
Change-Id: I91fc2e9738dcfb7be061041b5e000b21e7684184
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:23:34 +0000 (13:23 +0000)]
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:04:20 +0000 (13:04 +0000)]
Track libcore change
c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab
Bug:
27426684
Change-Id: I95b19ab738ff05996830c5429367d31ba0d257ba
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:47:07 +0000 (10:47 +0000)]
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 10:22:01 +0000 (10:22 +0000)]
Track libcore commit
05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c
Bug:
27426599
Change-Id: I9127856e82a16b891adcdb4e0e841ab2f3a85989
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>
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
Stephen Hines [Thu, 10 Mar 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix some errors in errorCalculator.rs."
Narayan Kamath [Thu, 10 Mar 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Fix 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
Narayan Kamath [Thu, 10 Mar 2016 17:39:33 +0000 (17:39 +0000)]
Yi Kong [Thu, 10 Mar 2016 16:50:02 +0000 (16:50 +0000)]
Narayan Kamath [Sat, 5 Mar 2016 11:04:19 +0000 (11:04 +0000)]
Track libcore change
45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
bug:
27426688
Change-Id: I6419f2b846932cd089efee1e74400fba97992c92
Yi Kong [Wed, 9 Mar 2016 15:01:04 +0000 (15:01 +0000)]
Track libcore change
b695412b529c8dced105867c6d9d7fd463a67714
Bug:
27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1
Alan Viverette [Thu, 10 Mar 2016 15:24:13 +0000 (15:24 +0000)]
Merge "fix 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
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."
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
Todd Kennedy [Wed, 9 Mar 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications"
Calin Juravle [Wed, 9 Mar 2016 11:57:36 +0000 (11:57 +0000)]
Merge "Update DexFile.getDexOptNeeded in framework"
Calin Juravle [Wed, 9 Mar 2016 11:57:23 +0000 (11:57 +0000)]
Merge "Fix VMRuntime.registerAppInfo usage"
Shubham Ajmera [Wed, 9 Mar 2016 09:57:16 +0000 (09:57 +0000)]
Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests"