Commit Graph

13746 Commits

Author SHA1 Message Date
Sergio Giro
87ececf5c8 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b
am: e04c029ed5

Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc
2016-08-31 12:51:16 +00:00
Sergio Giro
e04c029ed5 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285
am: 565c1fbf8b

Change-Id: Iec116355209c0770b4125142f93873766e29d61d
2016-08-31 12:42:32 +00:00
Sergio Giro
d53ae2c285 Merge "java.security: update java.security.KeyStore to jdk8u60" 2016-08-31 12:24:48 +00:00
Sergio Giro
7790666747 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b
am: 0ac5c50850

Change-Id: Iebb89cfa34482e3af937a6e15c97b146e875ebef
2016-08-31 08:37:24 +00:00
Sergio Giro
0ac5c50850 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017
am: 47f7d8384b

Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb
2016-08-31 08:31:17 +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
Neil Fuller
672e0b3211 Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c am: 033101bb99
am: c1d52a634c

Change-Id: I312e5b61c69a8ac366120127c18b094c4a14b2b1
2016-08-30 14:45:08 +00:00
Neil Fuller
c1d52a634c Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c
am: 033101bb99

Change-Id: I230bfff78e929b646c044f0f362531f05e16f632
2016-08-30 14:39:26 +00: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
d97db3e80e Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601
am: d8d495f1eb

Change-Id: I67e9aecd97ff9501af2839a80b3430db9678882e
2016-08-26 15:23:50 +00:00
Neil Fuller
d8d495f1eb Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa
am: eefc000601

Change-Id: Ia11ce811cd9a23e4c8979bd5c8429d9f918778bf
2016-08-26 15:16:56 +00:00
Neil Fuller
2af6c750ba Track java.lang.reflect.Executable API changes
Bug: 28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
2016-08-26 10:44:51 +01:00
Teng-Hui Zhu
d607d75790 Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test. am: 0a815bb94f
am: 3687be955f

Change-Id: I3de20fb11eaf1fc98c769f0aae1751a2b5549b1f
2016-08-25 18:36:06 +00: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
Teng-Hui Zhu
0a815bb94f Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test.
Also rename an internal class.

b/30877925

Change-Id: Ib971ed090907a0ab387dd7c768e2b77eb9b69f75
2016-08-24 16:12:20 -07:00
Sergio Giro
d141086546 frameworks/base: add changes coming from aosp am: 29835cc56e
am: 263820bb2c

Change-Id: Ifb8ea64e1dd24a75beafd29b0b61115c39b88fd1
2016-08-24 15:43:59 +00:00
Sergio Giro
263820bb2c frameworks/base: add changes coming from aosp
am: 29835cc56e

Change-Id: Ia89b81f3d5c1d8a4d20280355bb9d27b655098d3
2016-08-24 15:39:00 +00: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
Chong Zhang
9391bc557c Add new window type TYPE_DRAWN_APPLICATION am: fea963edee
am: 5e09ceb641

Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
2016-08-17 18:22:10 +00:00
Tobias Thierer
75cff53a34 Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe
am: 900471ab11

Change-Id: I14364e0805996c1bfe37e607bd58f35bd51101c8
2016-08-17 18:04:36 +00:00
Tobias Thierer
900471ab11 Revert "Revert "Track libcore update of Map classes to jdk8u60""
am: 7f5095ddfe

Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
2016-08-17 17:54:08 +00: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
9354783343 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 am: 17fea8b967
am: 8fc0ac9b39

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

Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
2016-08-17 17:03:44 +00:00
Tobias Thierer
be97d6c1ff Revert "Track libcore update of Map classes to jdk8u60" am: 7783213611
am: 5efe2b7515

Change-Id: Ic9386c17ec28b68de3127057eafbc60399e44f47
2016-08-17 17:00:13 +00:00
Tobias Thierer
70f8050b48 Track libcore update of Map classes to jdk8u60 am: fb2ade3dca
am: eb4eeb5323

Change-Id: I97ae4e7346424b6c58bc15f3682293d2854db23c
2016-08-17 17:00:09 +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
5efe2b7515 Revert "Track libcore update of Map classes to jdk8u60"
am: 7783213611

Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
2016-08-17 16:54:08 +00:00
Tobias Thierer
eb4eeb5323 Track libcore update of Map classes to jdk8u60
am: fb2ade3dca

Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
2016-08-17 16:54:05 +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
Chong Zhang
fea963edee Add new window type TYPE_DRAWN_APPLICATION
This type behaves like a normal TYPE_APPLICATION, except that WM
will always wait for it to be drawn before starting a transition.

WM always waits for TYPE_BASE_APPLICATION (main window), but for
TYPE_APPLICATION, it only waits if the window relayouts to visible
and gets a surface before the main window is drawn. If main window
itself is ready very fast, transition could start without the other
window.

bug: 30830849
Change-Id: Ife71a9812db7c8eba6ee4ead10ce4f31d9e93b40
2016-08-15 17:36:40 -07: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
Ta-wei Yen
b71cea3ade Add API to enable/disable the visual voicemail client am: 20f2ebbf4d
am: 6dc3efcc16

Change-Id: I13bc9bd9b12732fa3a7aa5de47cba5eacc5ba092
2016-08-11 17:31:25 +00:00
Ta-wei Yen
20f2ebbf4d Add API to enable/disable the visual voicemail client
This CL gives the default dialer, apps with carrier privilege, and
apps with MODIFY_PHONE_STATE the ability to enable/disable the visual
voicemail client.

This is a system API for NMR1. It will be revised in O.

Bug: 30709089
Change-Id: Ic24af14a5e3433c13ba8d253ad8504c94bf71c8f
2016-08-10 11:28:32 -07:00
Yi Kong
410c8b9f48 Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 am: 19df48b93b
am: d5e8edfe1d

Change-Id: I084e1057aa51a908d24b19d47ff6747e18494507
2016-08-09 18:19:09 +00:00
Yi Kong
d5e8edfe1d Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
am: 19df48b93b

Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
2016-08-09 18:07:29 +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
Todd Kennedy
8c073e0aad Move EphemeralResolverService am: 31b95e0265
am: fa67fad84e

Change-Id: Ieabd373b5557e03c6a189f070c8f79998e7a5a0a
2016-08-05 17:52:00 +00:00
Todd Kennedy
31b95e0265 Move EphemeralResolverService
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
2016-08-05 07:17:52 -07:00
Tobias Thierer
bd919aaca9 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 am: c548ff23bd
am: 22aa35d510

Change-Id: I99c0b399f523d4c04b3009e89414fe4fda716c81
2016-08-05 13:01:03 +00:00
Tobias Thierer
22aa35d510 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1
am: c548ff23bd

Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
2016-08-05 12:51:50 +00:00
Tobias Thierer
6cdfba9d58 Update api/test-current.txt for ProcessBuilder API am: 6af44aeea0
am: 95b759e178

Change-Id: I7a9ef8a5857cd8950f846dcb533041b9e08f6603
2016-08-05 12:50:33 +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
95b759e178 Update api/test-current.txt for ProcessBuilder API
am: 6af44aeea0

Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
2016-08-05 12:44:35 +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