213347 Commits

Author SHA1 Message Date
Narayan Kamath
0a1b294f68 Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." 2016-02-22 11:45:55 +00:00
Narayan Kamath
4b1e153716 Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.
bug: 27186457

Change-Id: I257eb422d6edcc1c52fc948995569fba6baf594f
2016-02-22 11:44:10 +00:00
Andreas Gampe
f2a9933fa7 Preload2: Fix object to sync on
When moving to sync on the right objects, these waits() have been
forgotten.

Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
2016-02-19 09:24:43 -08:00
Neil Fuller
b97cfe8076 Merge "Add flags needed to switch Jack to 1.8 for CTS targets" 2016-02-19 11:49:18 +00:00
Neil Fuller
855585f3c9 Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
Change-Id: I640b2ae6eeec17cab5cbc0bf7a4d54c4e4d35ccd
2016-02-19 11:46:19 +00:00
Neil Fuller
6b50207596 Merge changes from topic 'java_util_function_tests'
* changes:
  Add flags needed to switch Jack to 1.8 for CTS targets
  Add flags needed to switch Jack to 1.8 for CTS targets
2016-02-19 10:28:30 +00:00
Colin Cross
916ea08119 Merge "Add dumpsys meminfo --unreachable" 2016-02-19 06:10:36 +00:00
Adam Powell
2f6ec22f67 Restore auto-launch behavior for ACTION_CHOOSER with a single choice
For the initial release of Marshmallow auto-launching was suppressed
for ChooserActivity if there was only a single choice in order to let
the user confirm what would be launched. In practice, many apps use
ACTION_CHOOSER when they should probably use implicit intents, but
still others have use cases where setting a default doesn't make sense
and the user should still be able to make a choice when one is
available.

As the user confirmation didn't buy much in terms of developer API
expectations (ACTION_CHOOSER being a forced choice) and it adds
speedbumps to existing apps in the ecosystem, revert this change.

Bug 27243827

Change-Id: Id8fd5385d5b1f459e80b0096efe7e2944264739a
2016-02-18 14:41:41 -08:00
Neil Fuller
dce343dc41 Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit a835180b74af2cad853db08e8d41a7b04773759b)

Change-Id: I2be4db6788b14558f74534c24bb007f7fb8b6b67
2016-02-18 14:16:59 +00:00
Neil Fuller
eb09c6a984 Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit 3269825f0be29ec8ea08e0b7930d801f3d0206b4)

Change-Id: I294b50edb898699b57684eaf25016553338cb6a2
2016-02-18 14:09:41 +00:00
Neil Fuller
1818ef08a0 Merge "Add java.util.function APIs" 2016-02-18 13:32:30 +00:00
Neil Fuller
2b548ae7ae Add java.util.function APIs
Bug: 26814204
(cherry-picked from commit 311a97e7f41c494bc355f5d77adc276e2a400970)

Change-Id: Id00ac095e45dbdc63e9542f4f3a20c2179c3ab72
2016-02-18 11:39:09 +00:00
Zhijun He
3a171a7642 ImageReader: override the flexible YUV compatible formats
For gralloc HAL v0.1 devices, if the producer buffer format is NV21 or YV12,
the returned flexFormat will be NV21 or YV12, which causes CTS failure
for ImageReader decoder test. This change overrides the NV21 or YV12 image
formats to HAL_PIXEL_FORMAT_YCbCr_420_888 for such case. With this, the
ImageReader will work for the devices with older gralloc HAL implementations
for HAL_PIXEL_FORMAT_YCbCr_420_888 compatible formats.

Bug: 27136665
Change-Id: Ib4722f1f8dc20ad6561088755e4ab9d2e68f1b47
2016-02-17 18:27:55 -08:00
Michael Wright
7416762be0 Merge "Add keylayout for Xbox One controller" 2016-02-17 22:37:22 +00:00
Miao Wang
e2fc25722a Merge "[RenderScript] Fix potential leak in RS JNI" 2016-02-17 18:50:54 +00:00
Tim Clark
66a25396b0 Add keylayout for Xbox One controller
Change-Id: Ifb4005ed7b6345c9af126d8f1bd22c7e2921871f
2016-02-17 17:26:06 +00:00
Yohann Roussel
3289547de4 Merge "Suppress warnings of MultiDexLegacyAndException" 2016-02-17 15:15:57 +00:00
Yohann Roussel
d183f80687 Suppress warnings of MultiDexLegacyAndException
To clean build logs without disturbing the test.

Bug: 27155813


Change-Id: If80d7ad044dc9b4dfde5ded332e9ba566e536054
2016-02-17 15:15:15 +00:00
Sami Tolvanen
dcc79d83cb Merge "Support persist.sys.audit_safemode" 2016-02-16 21:52:13 +00:00
Andreas Gampe
a1e8ceb50b Merge "Frameworks/base: Fix registration function" 2016-02-16 20:41:30 +00:00
Andreas Gampe
8d48ef39db Frameworks/base: Fix registration function
Registration functions return "int."

(cherry picked from commit faa1033dc7d6b1ea6c17a483e586eaa167d154f9)

Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
2016-02-16 11:54:48 -08:00
Dimitry Ivanov
140d7d27f1 Merge "Add missing liblog dependency" 2016-02-13 01:03:41 +00:00
Dimitry Ivanov
5a06e3747d Add missing liblog dependency
Bug: http://b/27171986
Change-Id: I40b93ac0d4bfacfc38c08b5dbc5d2b3358a976cb
2016-02-12 16:44:33 -08:00
Amith Yamasani
c7f3631fbe Merge "When the device boots up, netd works more than required" 2016-02-12 18:35:11 +00:00
Amith Yamasani
b96673847a Merge "onAccountsUpdated shouldn't be called back after listener unregistered" 2016-02-12 17:50:17 +00:00
Miao Wang
a4ad5f8401 [RenderScript] Fix potential leak in RS JNI
Bug: 27145639
Change-Id: I80cf2971d803a3366a63caa3612a503a88639040
2016-02-11 12:34:35 -08:00
Przemyslaw Szczepaniak
2c97ab6ee0 Merge "Hide java.security.Signatue#getCurrentSpi" 2016-02-11 13:27:47 +00:00
Przemyslaw Szczepaniak
b1d6d8d234 Hide java.security.Signatue#getCurrentSpi
Internal implementation detail, shouldn't
be public.

Bug: 26689841
Change-Id: Ie0b7f9fc2659cb21f58f59c17df52c83e025a87c
2016-02-11 11:56:21 +00:00
Przemyslaw Szczepaniak
29fa8967e2 Merge "Remove java.nio.channels.* classes without test coverage." 2016-02-11 10:06:55 +00:00
Przemyslaw Szczepaniak
5fbc42d6a2 Remove java.nio.channels.* classes without test coverage.
Removed classes come from openJdk 1.7 and were never
implemented before. We lack a testing suite to verify that
they are working correctly. Those clasess might by
re-added in further releases

Bug: 27117463
Change-Id: Ia7554a9182507b9fa1c1b6db9573ab68cb641f36
2016-02-10 15:16:39 +00:00
Brian Carlstrom
205bf7a104 Merge "Java 8 in layoutlib-create" 2016-02-10 03:29:28 +00:00
Deepanshu Gupta
e96ffcfd50 Java 8 in layoutlib-create
Upgrade to ASM 5 and diamond operators.

Also minor fixes here and there.

Bug: 26442940

(cherry picked from commit 23e47f5621271db9b84f53f15a3e3d81d8b8b48d)

Change-Id: I770d80626ef7a7b8cba82ce2c5fbc54c8874bc6b
2016-02-09 19:14:10 -08:00
Elliott Hughes
9653790de2 Merge "The NDK samples moved a while back." 2016-02-10 01:17:33 +00:00
Elliott Hughes
3edfa8f67b The NDK samples moved a while back.
Change-Id: I10f419b0ad58f9c5417a3f06775e298c74f284dc
2016-02-09 16:12:02 -08:00
Sami Tolvanen
ee2b492832 Support persist.sys.audit_safemode
Don't leave safe more if persist.sys.audit_safemode is set, unless the
current build date is newer than the specified value.

This allows us to keep the device in safe mode across reboots until an
OTA has been applied or user data is wiped.

Bug: 26902605
Change-Id: I781c3059ea8d4fb2f0c923e4488b1932d69678d3
2016-02-09 12:43:19 -08:00
Przemyslaw Szczepaniak
9f93524112 Merge "Remove public InetAddress#getAddressInternal()" 2016-02-09 17:07:10 +00:00
Przemyslaw Szczepaniak
acfaee6e51 Merge "SocketImpl#getFileDescriptor shouldn't be public" 2016-02-09 17:05:48 +00:00
Paul Duffin
8405e5cd3b Merge "Replace usages of ShortNumberUtil with ShortNumberInfo" 2016-02-09 16:51:09 +00:00
Paul Duffin
c2884fe259 Replace usages of ShortNumberUtil with ShortNumberInfo
The ShortNumberInfo class appears to support the exact same
methods as the ShortNumberUtil class (at least in terms of the
methods used by this project) but is a singleton and so
instances cannot be created directly but instead must be
retrieved using the static getInstance() method.

The ShortNumberUtil class was deprecated in version 5.8 and
removed in 7.2.3 of libphonenumber. This change is required in
order to allow libphonenumber to be upgraded to 7.2.4.

Bug: 26975810
Change-Id: Ide40c65d12cb44453f84600fc4b5ad1ee1088470
2016-02-09 16:40:53 +00:00
Przemyslaw Szczepaniak
6c62502135 Remove public InetAddress#getAddressInternal()
This method shouldn't be public + can be replaced by
the #getAddress method

Bug: 26689841
Change-Id: I1a15e4b2085049564b1de57dbfb200d157d5ebe5
2016-02-09 10:36:31 +00:00
Przemyslaw Szczepaniak
2a705dc54d SocketImpl#getFileDescriptor shouldn't be public
It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.

Bug: 26689841
Change-Id: If275e249d2b46ee6cf22a06d62374bbf47c55342
2016-02-08 15:57:22 +00:00
Colin Cross
84b1e3554b Add dumpsys meminfo --unreachable
dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.

Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
2016-02-08 00:06:34 -08:00
John Reck
857b65657d Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case" 2016-02-05 23:38:10 +00:00
Alex Klyubin
e8fbc20e12 Merge "Fix typo in KeyInfo Javadoc." 2016-02-05 22:26:56 +00:00
Alex Klyubin
d9dded5a46 Fix typo in KeyInfo Javadoc.
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
2016-02-05 14:18:19 -08:00
Igor Murashkin
700ed048f9 Merge "api: Un-hide new reflection 1.8 APIs" 2016-02-05 17:53:04 +00:00
Igor Murashkin
a13e690566 api: Un-hide new reflection 1.8 APIs
(cherry-picked from commit 2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71
2016-02-05 17:50:50 +00:00
Martijn Coenen
1f4f7190a8 Merge "Improve NFC-F transceive() docs." 2016-02-05 09:38:16 +00:00
Martijn Coenen
6711e02033 Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.

Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
2016-02-05 10:26:16 +01:00
Amith Yamasani
f3c432059c Merge "Transit to correct state after alarm is fired" 2016-02-04 21:52:54 +00:00