Commit Graph

13430 Commits

Author SHA1 Message Date
Neil Fuller
47784a790b Merge "Track exposure of new j.l.reflect methods" 2016-09-01 13:15:52 +00:00
Sergio Giro
0c8c4a5d98 Merge "java.security.Principal: add default method Principal#implies" 2016-08-31 13:51:37 +00:00
Sergio Giro
c7bd0d0adc Merge "java.security.SecretKey: now extends from Destroyable" 2016-08-31 13:50:23 +00:00
Sergio Giro
d53ae2c285 Merge "java.security: update java.security.KeyStore to jdk8u60" 2016-08-31 12:24:48 +00:00
Sergio Giro
9484bff017 Merge "java.security.cert: update classes in java.security.cert (part 2)" 2016-08-31 08:18:57 +00:00
Sergio Giro
71b95041d6 java.security: update java.security.KeyStore to jdk8u60
Pulling upstream changes from OpenJDK version jdk8u60 for
java.security.KeyStore.

- New method getAttributes in KeyStore.Entry
- New interface Attribute in KeyStore.Entry
- New constructor specifying protection algorithm and protection parameters in
KeyStore.PasswordProtection.
- New getters for protection algorithm and protection parameters in
KeyStore.PasswordProtection
- In PrivateKeyEntry, SecretKeyEntry and TrustedCertificateEntry, new
constructor allowing to specify attributes, and corresponding getter
getAttributes.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.

This completes the port to jdk8u60 for this class.

Change-Id: Ifec9d07b8f6c367a6fa2672fd5c43747057336ad
Test: make droid docs, vogar KS*{Entry,Password}*.java
Bug: 29631070
2016-08-30 19:57:43 +00:00
Sergio Giro
6f285fa91e java.security.Principal: add default method Principal#implies
Given a Subject, Principal#implies returns true iff the principal
is one of the subject's principals.

Bug: 29631070
Test: make droid docs, vogar PrincipalTest.java
Change-Id: Ic24ca4bc26e29abdb67481af8255b8b1683a6f3a
2016-08-30 19:26:17 +01:00
Sergio Giro
7cdfa7499a java.security.SecretKey: now extends from Destroyable
Also:
- added comments
- replace <code> by @code tags

This completes the port of SecretKey to jdk8u60.

Bug: 29631070
Test: make droid docs
Change-Id: Id3604c1e62855d9fa9bf02a704c79c6d2131b006
2016-08-30 18:44:11 +01:00
Neil Fuller
671d9ce289 Track exposure of new j.l.reflect methods
Modifier.parameterModifiers() and Class.toGenericString().

Bug: 28666126
Change-Id: Idd230540e15aa5c298739a7ba72ed3e47159d037
2016-08-30 15:51:07 +01:00
Neil Fuller
2cc1eed174 Track libcore java.lang.reflect API changes
The modifications to Class / Field affect the .txt file
for no good reason: the use of a different generic
variable name results in changes because the tools think
methods have been added / removed when they haven't.

The only interface change from upstream included is adding
"extends AnnotatedElement" to GenericDeclaration. All (platform)
subclasses already did implement this interface. App classes may
be affected but only if they do not currently implement those
methods and they are somehow called.

Bug: 28666126
Test: cts ran for libcore (libcore, harmony_java_lang, org)
Change-Id: Ice5afb80834d7f7a4d23dade21a1590c6b323ed8
2016-08-30 12:08:10 +01:00
Neil Fuller
2af6c750ba Track java.lang.reflect.Executable API changes
Bug: 28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
2016-08-26 10:44:51 +01:00
Sergio Giro
5a2297190a java.security.cert: update classes in java.security.cert (part 2)
Pulling upstream changes from OpenJDK version jdk8u60 classes
in java.security.cert

- Certificate#hashValue: cache the hash value as to avoid recomputation.
Use the Arrays#hash instead of a simple ad-hoc function.
- Certificate#verify(PublicKey, Provider): new method that just throws
UnsupportedOperationException.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags and use of a package-info.java in
place of a package.html file.
- Added comments.

Note not all classes in java.security.cert are updated:  X509CRL has more
significant changes and deserves a separate CL.

Change-Id: I44120f1b34c9dc3c062a5d01583bcc87fa2cd558
Test: make droid docs, vogar CertificateTest
Bug: 29631070

Please enter the commit message for your changes. Lines starting
2016-08-25 15:17:58 +01:00
Sergio Giro
29835cc56e frameworks/base: add changes coming from aosp
Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211

Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
2016-08-24 15:45:02 +01:00
Tobias Thierer
6f15eabd29 Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master 2016-08-17 17:38:48 +00:00
Tobias Thierer
7f5095ddfe Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 7783213611.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
2016-08-17 17:11:01 +00:00
Tobias Thierer
17fea8b967 Merge "Track libcore update of Map classes to jdk8u60."
am: ec6a323da2

Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
2016-08-17 16:54:30 +00:00
Tobias Thierer
7783213611 Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.

Bug: 30911913

This reverts commit fb2ade3dca.

Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
2016-08-17 14:59:28 +00:00
Tobias Thierer
fb2ade3dca Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640

This CL requires base CLs, which will get merged from aosp-master,
in order to build.

Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
2016-08-17 11:06:27 +01:00
Tobias Thierer
9d332f2dc8 Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.

Test: make update-api

Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
2016-08-16 14:16:41 +01:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4)
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
2016-08-11 22:18:19 +00:00
Yi Kong
19df48b93b Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit f646aa14cd)
2016-08-09 18:57:16 +01:00
Yi Kong
f646aa14cd Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
2016-08-09 16:43:32 +00:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect"
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
2016-08-05 12:44:48 +00:00
Tobias Thierer
6af44aeea0 Update api/test-current.txt for ProcessBuilder API
Test: make update-api docs

Bug: 27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
2016-08-05 12:37:21 +00:00
Tobias Thierer
e49469aed1 Merge "APIs for ProcessBuilder.Redirect" 2016-08-05 12:36:35 +00:00
Przemyslaw Szczepaniak
50f3429d14 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 2016-08-05 09:36:41 +00:00
Przemyslaw Szczepaniak
49929ccf46 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82
Version with test-current.txt

Bug: 28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
2016-08-05 09:33:51 +00:00
Przemyslaw Szczepaniak
82957239fe Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug: 30402085
2016-08-04 11:56:09 +00:00
Tobias Thierer
97b24c2f6a Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
am: f1d119ccd3

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
2016-08-04 11:00:03 +00:00
Tobias Thierer
4122b913f3 Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)
Test: "make" succeeds.

Bug: 30402085
Change-Id: I4bc4b5dcfab04ac756578c2fae7a337e74587b66
2016-08-03 18:16:14 +01:00
Przemyslaw Szczepaniak
bc7820ec76 Track libcore change 0e393b4d628541e84e31210342f4103315c07e23
Bug: 28666126
Change-Id: Ib63e14c5c72fd3a13f09a90358cb137e318a3653
2016-08-02 12:01:07 +00:00
Sergio Giro
8261d1e042 api: destroy() and isDestroyed() methods are now default in Destroyable
Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug: 29631070
2016-07-27 12:12:06 +00:00
Sergio Giro
91e11c95f2 Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\"
am: 877d6e75e6

Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
2016-07-27 11:39:10 +00:00
Sergio Giro
877d6e75e6 Merge "api: destroy() and isDestroyed() methods are now default in Destroyable" 2016-07-27 11:30:55 +00:00
Tobias Thierer
5296a60e27 APIs for ProcessBuilder.Redirect
This CL is required for the following libcore change:
Revert "Hide ProcessBuilder.Redirect and associated APIs."

Test: Checked that 'make' succeeds.

Bug: 27464570
Change-Id: I7719ab495863d3fc8cdd00fbe19ac40a37b5a6f2
2016-07-26 15:30:44 +01:00
Shubham Ajmera
18941cb53f Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a" 2016-07-11 10:08:40 +00:00
Shubham Ajmera
a0d7917c36 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a
(cherry-picked from commit 30cbe3b264)

Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
2016-07-11 10:06:11 +00:00
Sergio Giro
9e51eed091 api: destroy() and isDestroyed() methods are now default in Destroyable
Test: make droid docs and check-ojluni-files
Bug: 29631070
Change-Id: I93015997fbb18a45ba438f6bfc5c6564f053da64
2016-07-08 13:35:15 +01:00
Przemyslaw Szczepaniak
9ede567f7c Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968
Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
2016-07-05 08:59:10 +00:00
Przemyslaw Szczepaniak
ce482360b9 Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\"
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555
2016-07-05 08:54:24 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
bab82f1df8 Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b
Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
2016-07-04 16:35:28 +01:00
Shubham Ajmera
30cbe3b264 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a
Change-Id: If8e4308d6c43eae7e2661bc083dea657969b9254
2016-06-30 13:44:38 +01:00
Przemyslaw Szczepaniak
f0db6e8d94 Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968
Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
2016-06-29 17:41:01 +01:00
Yi Kong
79f65e5d67 Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7 Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master 2016-06-24 16:47:31 +00:00
Yi Kong
f388075f8f Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" 2016-06-24 16:47:03 +00:00
Przemyslaw Szczepaniak
3606de0fb4 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
am: ab3d167f06

Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1
2016-06-24 11:53:57 +00:00
Przemyslaw Szczepaniak
387191bc64 Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb
am: 12bb15c1d3

Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd
2016-06-24 11:33:42 +00:00
Przemyslaw Szczepaniak
ab3d167f06 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
version with test-current.txt

Bug: 28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059
2016-06-24 11:33:27 +00:00