14449 Commits

Author SHA1 Message Date
Sergio Giro
f3b7b13691 Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0 am: 61c0996d6f
am: 016e850921

Change-Id: I35ad05729d5575b2e790547f2bede8c849395ada
2016-09-01 01:18:28 +00:00
Sergio Giro
338193c457 Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287 am: d4b193c30c
am: 22b8317a49

Change-Id: I55b5522eb98b5db4c8599202361ab9595a38d461
2016-09-01 01:18:23 +00:00
Sergio Giro
196c5b82df Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b am: e04c029ed5
am: 87ececf5c8

Change-Id: I970ea89c8e278b675ef63645224e456d932b614b
2016-09-01 01:18:18 +00:00
Sergio Giro
26275abbbd Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b am: 0ac5c50850
am: 7790666747

Change-Id: Ia6ec15ec97fecda1a182b5b1b875fcfb8446dc5e
2016-09-01 01:18:13 +00:00
Neil Fuller
12452e09a7 Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c am: 033101bb99 am: c1d52a634c
am: 672e0b3211

Change-Id: Icceb495c0f243912556cc3c21d32fa3773bc20e9
2016-08-31 22:40:50 +00:00
Sergio Giro
016e850921 Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0
am: 61c0996d6f

Change-Id: I4ea45e1007f5bbbd086d200f5be9227a03eab44d
2016-08-31 14:21:41 +00:00
Sergio Giro
61c0996d6f Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98
am: e639bbd7d0

Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d
2016-08-31 14:15:46 +00:00
Sergio Giro
22b8317a49 Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287
am: d4b193c30c

Change-Id: I34fac82dc8bfbd157b70b637a13d188692b3b5e2
2016-08-31 14:09:44 +00:00
Sergio Giro
d4b193c30c Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145
2016-08-31 14:04:09 +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
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
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
a402325510 Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601 am: d8d495f1eb
am: d97db3e80e

Change-Id: I01b15ae35aa3c66e4d98938bf1270ea2c4194a4a
2016-08-30 17:01:39 +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
Teng-Hui Zhu
76817faf29 Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test. am: 0a815bb94f am: 3687be955f
am: d607d75790

Change-Id: Id83875c14472af2ba44f0194c897460ec6aa427d
2016-08-29 22:39:09 +00:00
Abhijith Shastry
b6ca34a343 Merge "Add a carrier config for RCS config server URL." 2016-08-29 18:57:08 +00: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
Chet Haase
df10332181 Document and deprecate various old, undocumented classes
These classes are mostly undocumented and, in some cases, completely
unobvious in what they do or how to use them. In some cases, I added
docs to explain the API. In other cases (ProgressDialog, ZoomButton,
DialerFilter), I deprecated the classes because there are far better ways
to accomplish that functionality with today's platform.

Issue #2164052 Underdocumented classes in Eclair

Change-Id: Ief0e7267852c2cb3c5ae604b3d902d66c89f4cd3
2016-08-25 12:38:46 -07: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
Abhijith Shastry
2215c9b5d0 Add a carrier config for RCS config server URL.
BUG: 31066641
Change-Id: Iad9aa60e6c8083aaeb7ce1461ff15012a6df0a29
2016-08-24 16:17:04 -07: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
Keun-young Park
badbbae6fa allow external USB host management
- Setting config_UsbDeviceConnectionHandling_component leads into
  launching specified Activity whenever USB device is connected.
- This allows external Activity to manage USB device based on
  its own setup and settings.
- Device access can be passed to other app with permission update
  by UsbManager.grantPermission.
- added UsbDeviceConnection.resetDevice() to reset USB device connected.
  This is necessary to get device out from AOAP.
- Test requires installing UsbHostExternalManagmentTestApp and
  AoapTestHost to USB host, and AoapTestDevice to USB Device.

bug: 26404209
Change-Id: I8e77ddc646c15454d9b2ecf1356924cf6351fc28
2016-08-24 15:00:08 -07:00
Sergio Giro
34e057421a 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
(cherry picked from commit 29835cc56eb26089cd8d2c21c7507c9d0588ceb0)
2016-08-24 20:11:59 +00: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
Ned Burns
be92fca27c Merge "Add ViewConfiguration.getScaledScrollFactor()" 2016-08-18 21:16:49 +00:00
Ned Burns
69af432039 Add ViewConfiguration.getScaledScrollFactor()
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.

Change-Id: I537af010610bb374ab29a41aff4fae5b07bece6e
2016-08-18 15:07:05 -04:00
TreeHugger Robot
df6183299b Merge "Remove permission review build property - framework" 2016-08-18 00:56:38 +00:00
Svet Ganov
77df6f315d Remove permission review build property - framework
Change-Id: Ifcfd436f2d57a6006ef804292d2875434e4669da
2016-08-17 14:52:26 -07:00
Chong Zhang
921f8e35d8 resolve merge conflicts of 9391bc5 to master
Change-Id: I6de231781233826b399688dc8ead70ba515b1ccb
2016-08-17 14:38:12 -07:00
Tobias Thierer
b097c03913 Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe am: 900471ab11
am: 75cff53a34

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

Change-Id: I0ed4962659511452c73f93747faf2abe447d92a4
2016-08-17 17:38:29 +00:00