OSDN Git Service
Yongjiang Wu [Wed, 13 Apr 2016 14:34:40 +0000 (14:34 +0000)]
Merge "Fix: the label "customize" is not updated after changing language"
am:
b4c4e20
* commit '
b4c4e20960094ff401ca9656bdbe86e17891e2a9':
Fix: the label "customize" is not updated after changing language
Change-Id: I51870941759f5c8ebac9f91191eae004c4ad729b
Treehugger Robot [Wed, 13 Apr 2016 14:25:04 +0000 (14:25 +0000)]
Merge "Fix: the label "customize" is not updated after changing language"
Kaori Katou [Wed, 13 Apr 2016 13:42:46 +0000 (13:42 +0000)]
Merge "Dismiss keyguard when user button is tapped"
am:
e3d556f
* commit '
e3d556f7853268f309cd151d2bf550f9222cc81c':
Dismiss keyguard when user button is tapped
Change-Id: I4fac2ae58c7ab0212894f2affcc364cc8f59d4ef
Treehugger Robot [Wed, 13 Apr 2016 13:32:38 +0000 (13:32 +0000)]
Merge "Dismiss keyguard when user button is tapped"
Calin Juravle [Wed, 13 Apr 2016 11:54:23 +0000 (11:54 +0000)]
Merge "Handle dalvik.vm.jitprithreadweight property"
am:
00ba615
* commit '
00ba61551e54a46b0bca9feb3d35f18021021c9a':
Handle dalvik.vm.jitprithreadweight property
Change-Id: I492bdae2ad367ec9204608f430b3b47dbc2e7ea9
Calin Juravle [Wed, 13 Apr 2016 11:44:56 +0000 (11:44 +0000)]
Merge "Handle dalvik.vm.jitprithreadweight property"
Shinichiro Hamaji [Wed, 13 Apr 2016 02:37:35 +0000 (02:37 +0000)]
Merge "Let WAPPushManager depend on its proguard.flags"
am:
4e2a67d
* commit '
4e2a67d0123060c1a8902635281397e01a10a2b3':
Let WAPPushManager depend on its proguard.flags
Change-Id: Ibc6ef3a5de050ddfafd400e546ae038a09aa4a92
Shinichiro Hamaji [Wed, 13 Apr 2016 02:29:14 +0000 (02:29 +0000)]
Merge "Let WAPPushManager depend on its proguard.flags"
Yang Ni [Tue, 12 Apr 2016 22:15:41 +0000 (22:15 +0000)]
Merge "Destroy Type created by Allocation.createSized()"
am:
2a64e23
* commit '
2a64e23857b9e1f5b396f15b98c29f050a5c7e97':
Destroy Type created by Allocation.createSized()
Change-Id: I973620633aaa9fcb3fa10ff819cdc565dcf39d9f
Yang Ni [Tue, 12 Apr 2016 22:07:56 +0000 (22:07 +0000)]
Merge "Destroy Type created by Allocation.createSized()"
Calin Juravle [Tue, 12 Apr 2016 13:12:04 +0000 (14:12 +0100)]
Handle dalvik.vm.jitprithreadweight property
Bug:
28065407
Bug:
27865109
Change-Id: I8cebc22a9e072fd1d6d765427a0cd59ba2201bf6
Yang Ni [Tue, 12 Apr 2016 16:12:33 +0000 (16:12 +0000)]
Merge "Destroy Closures in ScriptGroup"
am:
01db883
* commit '
01db88335d8cb80eaa9698321bb9e7e5e974f195':
Destroy Closures in ScriptGroup
Change-Id: I6406b5fa3c518853a1227b4d691de316b0828357
Yang Ni [Tue, 12 Apr 2016 16:00:46 +0000 (16:00 +0000)]
Merge "Destroy Closures in ScriptGroup"
Yi Kong [Tue, 12 Apr 2016 14:56:15 +0000 (14:56 +0000)]
Yi Kong [Tue, 12 Apr 2016 14:44:30 +0000 (14:44 +0000)]
Yi Kong [Tue, 12 Apr 2016 13:05:59 +0000 (14:05 +0100)]
Track libcore change
2115cc0ca7d60965a361129d8826478ff2d847e4
Bug:
28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
Yang Ni [Thu, 7 Apr 2016 18:17:59 +0000 (11:17 -0700)]
Destroy Type created by Allocation.createSized()
Bug:
27972184
Change-Id: I4f80c74079087eab20b75a701c56cde141322462
Stephen Hines [Mon, 11 Apr 2016 22:00:40 +0000 (22:00 +0000)]
Merge "Fix typos for the word "Unsupported"."
am:
9e57114
* commit '
9e571141991b7ac2b9f46856d6268b1e13d03e95':
Fix typos for the word "Unsupported".
Change-Id: Ia29d6f9894a0dfa1449d33ffe07ccfff7de4282d
Stephen Hines [Mon, 11 Apr 2016 21:48:34 +0000 (21:48 +0000)]
Merge "Fix typos for the word "Unsupported"."
Stephen Hines [Mon, 11 Apr 2016 20:05:55 +0000 (13:05 -0700)]
Fix typos for the word "Unsupported".
Bug: https://code.google.com/p/android/issues/detail?id=206490
Change-Id: Ie1b2c2b0960d8dd8c12ed06d84a16913cd057221
qinglian.x.zhang [Mon, 11 Apr 2016 14:46:54 +0000 (14:46 +0000)]
Merge "Show volume safety warning for all users"
am:
0a51955
* commit '
0a5195577ccb7006b0b098b4228e80d24fa28d79':
Show volume safety warning for all users
Change-Id: I38306326931bc1bb5ccdacdc3e153b4fa2a3ad7e
Julia Reynolds [Mon, 11 Apr 2016 14:33:03 +0000 (14:33 +0000)]
Merge "Show volume safety warning for all users"
qinglian.x.zhang [Thu, 14 Jan 2016 05:18:37 +0000 (13:18 +0800)]
Show volume safety warning for all users
The volume safety warning is shown only for owner.
It should be shown for all users.
Change-Id: I616038e3eecf8523aa5edd48843b0eb444607d2f
Kaori Katou [Tue, 26 May 2015 07:25:04 +0000 (16:25 +0900)]
Dismiss keyguard when user button is tapped
When multi-user is disabled and user button is tapped
on the keyguard, the contact app is displayed behind the keyguard.
The keyguard should be dismissed when the contact app is launched.
Change-Id: I7daa0bec84b5172e78668cc71e51955f166ede0a
Yang Ni [Tue, 5 Apr 2016 00:09:11 +0000 (17:09 -0700)]
Destroy Closures in ScriptGroup
Bug:
27973681
Implemented correct destruction in ScriptGroup.destroy() and
Clsoure.destroy(), which properly destroys child BaseObj's.
Change-Id: I946f62c2979d6a338b8883514cacad472a213c5c
Yi Kong [Thu, 7 Apr 2016 17:32:40 +0000 (17:32 +0000)]
Yi Kong [Thu, 7 Apr 2016 17:23:58 +0000 (17:23 +0000)]
Yi Kong [Thu, 7 Apr 2016 16:58:28 +0000 (16:58 +0000)]
Yi Kong [Thu, 7 Apr 2016 16:50:51 +0000 (16:50 +0000)]
Yi Kong [Thu, 7 Apr 2016 16:20:31 +0000 (17:20 +0100)]
Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug:
28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
Yi Kong [Wed, 6 Apr 2016 12:15:34 +0000 (13:15 +0100)]
Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
Shinichiro Hamaji [Thu, 7 Apr 2016 09:02:21 +0000 (18:02 +0900)]
Let WAPPushManager depend on its proguard.flags
Touching packages/WAPPushManager/proguard.flags didn't let
the .dex file be rebuilt.
Bug:
27954979
Change-Id: I42410eb06a970f7ec5f36496840640d228ad376b
Wanwu Peng [Tue, 5 Apr 2016 18:01:43 +0000 (18:01 +0000)]
Merge "Fix MTP_TYPE_UINT128 data conversion issue"
am:
ba23e45
* commit '
ba23e453487fcb18e91b4919b933012458f17fdd':
Fix MTP_TYPE_UINT128 data conversion issue
Change-Id: I03c062ce58283f6886ff1d2922755a9a584a73ec
Marco Nelissen [Tue, 5 Apr 2016 17:51:57 +0000 (17:51 +0000)]
Merge "Fix MTP_TYPE_UINT128 data conversion issue"
Yang Ni [Tue, 5 Apr 2016 01:54:57 +0000 (01:54 +0000)]
Merge "Avoid destroying Device separately"
am:
a314384d
* commit '
a314384dc9785f97bf0f3bb9256f6ea2c765930c':
Avoid destroying Device separately
Change-Id: Ia9b269456b01b9ba1f742c674449392fb6601599
Yang Ni [Tue, 5 Apr 2016 01:49:21 +0000 (01:49 +0000)]
Merge "Avoid destroying Device separately"
Yang Ni [Mon, 4 Apr 2016 17:23:57 +0000 (10:23 -0700)]
Avoid destroying Device separately
Bug:
27983025
Device should be destroyed inside the destructor of the associated
Context.
Change-Id: I921a89974e1174f837349a89aef9b03efa4882f5
(cherry picked from commit
4a70df58a32591429ec04902deac2b2210fb96c3)
Yi Kong [Mon, 4 Apr 2016 10:37:56 +0000 (10:37 +0000)]
Yi Kong [Mon, 4 Apr 2016 10:28:16 +0000 (10:28 +0000)]
Ajay Panicker [Fri, 1 Apr 2016 23:56:42 +0000 (23:56 +0000)]
Merge "Allow factory reset when bluetooth is off (1/2)"
am:
1dfa47e
* commit '
1dfa47ee3e55592249a76cb72f9e16be664f2b40':
Allow factory reset when bluetooth is off (1/2)
Change-Id: I0e9300c86a6ec1f07d5b1a5c83f1b87a2c5ffaa5
Ajay Panicker [Fri, 1 Apr 2016 23:46:33 +0000 (23:46 +0000)]
Merge "Allow factory reset when bluetooth is off (1/2)"
Yi Kong [Fri, 1 Apr 2016 19:53:10 +0000 (20:53 +0100)]
Track libcore commit
cf86f3319e738c76c5e97ad95bb8a4e30654a787
Bug:
27960078
Change-Id: If89390ad1ddc3088a8552107bf27a51b1d3c6d02
Yang Ni [Fri, 1 Apr 2016 16:31:32 +0000 (16:31 +0000)]
Merge "Silence clang static analyzer warnings"
am:
01e307d
* commit '
01e307d4613a34cdbc9940a6f134fac0f658a722':
Silence clang static analyzer warnings
Change-Id: Ia1e6d217dbbc7e0294413c5f35de027c2f23de3d
Yang Ni [Fri, 1 Apr 2016 16:26:17 +0000 (16:26 +0000)]
Merge "Silence clang static analyzer warnings"
Yi Kong [Fri, 1 Apr 2016 13:11:13 +0000 (13:11 +0000)]
Yi Kong [Fri, 1 Apr 2016 12:59:01 +0000 (12:59 +0000)]
Andre Eisenbach [Fri, 1 Apr 2016 00:28:20 +0000 (00:28 +0000)]
Merge "Always use Write Request for GATT descriptor writes"
am:
2358043
* commit '
235804398300e46baf5ebf14bb5c36badf8dd286':
Always use Write Request for GATT descriptor writes
Change-Id: Ifb3a81c527cf21fc90a6cd77901eae85f29ab0cc
Andre Eisenbach [Fri, 1 Apr 2016 00:28:19 +0000 (00:28 +0000)]
Merge "Fix log spam in getCharacteristicById()"
am:
7bf9e19
* commit '
7bf9e19892434a256a9cbef63ab7ff958df32436':
Fix log spam in getCharacteristicById()
Change-Id: I980c8e7f169b565f068c949bc6740650518ecc19
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()"
Ajay Panicker [Tue, 1 Mar 2016 00:09:14 +0000 (16:09 -0800)]
Allow factory reset when bluetooth is off (1/2)
Bug:
27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
Yang Ni [Thu, 31 Mar 2016 23:05:44 +0000 (23:05 +0000)]
Merge "Added CloseGuard for BaseObj"
am:
64c4c1c
* commit '
64c4c1c1cd24157f93dc3f07f7dff299b7d0c8f8':
Added CloseGuard for BaseObj
Change-Id: I66e51df82a5af12bfe7654701e89763f81c6e8f3
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 17:00:32 +0000 (17:00 +0000)]
Merge "Remove support of disabling Jack."
am:
4101448
* commit '
410144887ec32d2bfc10554effce4f7d512ea568':
Remove support of disabling Jack.
Change-Id: I81eb8fd195c9ee4e1a046485ad4c0e4a6ae0ac25
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:19:32 +0000 (16:19 +0000)]
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
Yongjiang Wu [Sat, 20 Feb 2016 10:28:10 +0000 (18:28 +0800)]
Fix: the label "customize" is not updated after changing language
The text "customize" is not updated in onConfigurationChanged()
after changing language, so the "customize" text is displayed
incorrectly.
Change-Id: Id6ecdff1f22724955fb1080609da15ccd38d2209
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:42:34 +0000 (20:42 +0000)]
Merge "Fix typo in Conversion Functions doc"
am:
a70a5e5
* commit '
a70a5e545900c4be7243a128f62a8a1ff137516e':
Fix typo in Conversion Functions doc
Change-Id: Ibe7dd4fef314bbbc7f178314ffe341611adc5249
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
Wanwu Peng [Wed, 2 Mar 2016 10:16:46 +0000 (18:16 +0800)]
Fix MTP_TYPE_UINT128 data conversion issue
If type is MTP_TYPE_UINT128, use MtpDataPacket.putUInt128()
not MtpDataPacket.putInt128() to write data to the packet.
Change-Id: Icb9994e24ac216f3bb07d0a2b3cd7ccf3f8c6f3f
Miao Wang [Wed, 30 Mar 2016 01:09:00 +0000 (01:09 +0000)]
Merge changes Iaa88ac02,Ic6f8d1da,Idd07db5d
am:
1a11efb
* commit '
1a11efba2bf3bc12fab53df1185dad4756d6b313':
[RenderScript] Update documentation for Allocation.setAutoPadding().
[RenderScript] Fix IntrinsicConvolve documentation.
[RenderScript] Update the documentation of Script.LaunchOptions
Change-Id: Ia9e405f046c58e9cda8d1dcb3e6f862648c1ffbf
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)
zhangshuxiao [Tue, 29 Mar 2016 22:47:04 +0000 (22:47 +0000)]
Merge "When wifi ssid is empty, return WifiSsid.NONE"
am:
4af5c34
* commit '
4af5c34a78ab65c22fa931bd9167f18b9211fd99':
When wifi ssid is empty, return WifiSsid.NONE
Change-Id: I800fb4daf9773fff697e6cb3ac0c6734085248d8
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:33:36 +0000 (21:33 +0000)]
Merge "Frameworks/base: Refactor package manager"
am:
453a77c
* commit '
453a77c702f0c857b4900aeb5772e37d0a309b1f':
Frameworks/base: Refactor package manager
Change-Id: Ia8003f32edfa9cb22e4e2378c2b733a736cb8da1
Andreas Gampe [Tue, 29 Mar 2016 21:24:18 +0000 (21:24 +0000)]
Merge "Frameworks/base: Refactor package manager"
Markus Michler [Tue, 29 Mar 2016 18:30:31 +0000 (18:30 +0000)]
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
am:
7160459
* commit '
71604596117c02a885da356cd0015c29493e48bc':
Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()
Change-Id: I5d522742dc4c7a46a74dfe4838c5bde8aadd8789
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:12:43 +0000 (15:12 +0000)]
Merge "Add OpenJDK 8 java.util.List Default Methods"
am:
0a999d1b
* commit '
0a999d1b25e862dffa8008706f0754d275135282':
Add OpenJDK 8 java.util.List Default Methods
Change-Id: I32da5d00eb4007d1e69c34765d4f92cbdd6bd3d3
Shubham Ajmera [Tue, 29 Mar 2016 15:07:06 +0000 (15:07 +0000)]
Merge "Port OpenJDK8 changes in java.util.Map"
am:
21283ee
* commit '
21283ee2b5bc4d3279d47aa8f9bcc1ae88100544':
Port OpenJDK8 changes in java.util.Map
Change-Id: I4d3011640b838d56b611b9e1223bba48d5a2a74e
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"
Yinlin Cai [Tue, 29 Mar 2016 14:15:56 +0000 (14:15 +0000)]
Merge "Fix incorrect behavior for statusbar and quicksettings panel"
am:
fa9a20d
* commit '
fa9a20dd525bf3df2e3282c40ae23b3a3f3a7ee0':
Fix incorrect behavior for statusbar and quicksettings panel
Change-Id: I1e7975f02fe26dcf6f92f46f0626de14212932f4
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 04:00:21 +0000 (04:00 +0000)]
Merge "[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray"
am:
994db1b
* commit '
994db1bb2c0f4a480d6361b5659906ba8f3cf26e':
[RenderScript] Fail with Exception from validateObjectIsPrimitiveArray
Change-Id: Id83d0a3fa9fed2bd3f0b7b19e5bc4dc162f52011
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:49:03 +0000 (21:49 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
am:
64ade5d
* commit '
64ade5dcfc1f7adabaa67bb5fdd97554380346b9':
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."
Dan Austin [Thu, 24 Mar 2016 19:03:42 +0000 (12:03 -0700)]
Address const issues in preparation for libcxx rebase.
Change-Id: Ia9edf466ab4d1b6cc3f6c6ed86b333e6521c528d
Jimmy Dalqvist [Mon, 28 Mar 2016 14:50:42 +0000 (14:50 +0000)]
Merge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop"
am:
faf2c42
* commit '
faf2c42ac9658ba36b9dfda0803bed66a2fd1c90':
Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop
Glenn Kasten [Mon, 28 Mar 2016 14:42:45 +0000 (14:42 +0000)]
Merge "Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop"
Shubham Ajmera [Mon, 28 Mar 2016 11:08:28 +0000 (11:08 +0000)]
Merge "Add OpenJDK Arrays parallelSetAll methods"
am:
1aafd31
* commit '
1aafd31b4a8df4fe6f0c22ca3447bc762aecbb4d':
Add OpenJDK Arrays parallelSetAll methods
Shubham Ajmera [Mon, 28 Mar 2016 10:57:38 +0000 (10:57 +0000)]
Merge "Add OpenJDK Arrays parallelSetAll methods"
Yang Ni [Fri, 25 Mar 2016 22:49:07 +0000 (15:49 -0700)]
Silence clang static analyzer warnings
Bug:
27272549
Avoid uninitialized struct fields.
Avoid unused variables.
Avoid alloca(0).
Change-Id: I19a826aabaa4032caf728e16d242f5bb77f2b450
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