Commit Graph

13814 Commits

Author SHA1 Message Date
Tobias Thierer
041bb95132 Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09
am: 19e46f91fa

Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91
2016-10-03 14:05:33 +00:00
Tobias Thierer
01614e4e7f Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" 2016-10-03 13:41:48 +00:00
Przemyslaw Szczepaniak
0053ff7e01 Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" am: c60c70dcf9 am: 8297d74de5
am: 61eb1615a6

Change-Id: I00de82b6e9d12b7f6bd602515c21f6922d8d1983
2016-09-30 09:01:52 +00:00
Przemyslaw Szczepaniak
c60c70dcf9 Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" 2016-09-30 08:43:17 +00:00
Neil Fuller
ff2f0dae1b Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b4f am: 125a273e8a
am: cc1cf38749

Change-Id: I9bd88a090617a9570197e7e7416cbfe2f86444d1
2016-09-29 23:45:04 +00:00
Neil Fuller
9a33f3408e Merge "Unhide constants related to type annotations" am: 8ac0f45384 am: 505b90ad5c
am: de1db61758

Change-Id: I435010db7eda813b36221090cc1e10a27e79480e
2016-09-29 23:43:45 +00:00
Shubham Ajmera
c95b2c85f3 Add new StrictMode thread policy - DETECT_UNBUFFERED_IO
This will enable the developers to check if they could replace an unbuffered
I/O operation with a corresponding buffered I/O operation.

The policy can be set as follow:
     StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
        .detectUnbufferedIO().build());

Test: vogar BlockGuardTest
Bug: 3018772
Change-Id: Ib804a8e9980ae40abfd216f8b87c250fd413bd5c
(cherry picked from commit 9b7184a8fd)w
2016-09-29 16:36:12 +01:00
Neil Fuller
bd32321b4f Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" 2016-09-29 13:08:30 +00:00
Neil Fuller
4c1d37b2a0 Unhide constants related to type annotations
Type annotations are supported in the compiler, but not the
Android runtime. Unhiding these is therefore still
reasonable.

Bug: 30391692
Test: make droid
Change-Id: I39db1099918fe3bd6321f2d755a988cb73f657c6
2016-09-28 16:57:59 +01:00
Neil Fuller
0543f71b82 Fix AnnotatedElement.getDeclaredAnnotation() generic signature
To match upstream OpenJDK 8.

Bug: 31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
2016-09-28 16:56:49 +01:00
Neil Fuller
b36fad8a5f Rerun of update-api with no changes
Picks up a small change to Parameter.

Looks like it was caused by a mid-air collision between
commit 3ead539c01, which
introduced Parameter, and commit
b4fcc6136e which
introduced improvements to generics in the .txt file.

Test: make droid
Change-Id: If1c11e9303d17854ab1e5559c9a412cc6de54685
2016-09-28 16:51:03 +01:00
Tobias Thierer
e44534ddc8 Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6 am: 29319829fb
am: 49d903dac4

Change-Id: Iaeab7c7c8d24b68d2be75ddd3f6055ba78be906d
2016-09-27 14:22:08 +00:00
Tobias Thierer
49d903dac4 Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6
am: 29319829fb

Change-Id: I02fba9b316fed6ee248c69f97570da8d1f1ac531
2016-09-27 14:16:28 +00:00
Tobias Thierer
29319829fb Merge "API: Update ResourceBundle to OpenJDK8u60"
am: 9d16a441a6

Change-Id: I90e0bb992f002718c5f509c226fdc0d57e651aff
2016-09-27 14:11:45 +00:00
Tobias Thierer
9d16a441a6 Merge "API: Update ResourceBundle to OpenJDK8u60" 2016-09-27 14:03:45 +00:00
Tobias Thierer
45716d6539 API changes for Locale to OpenJDK8u60 (part 1/2)
Bug: 29935305

Test: make update-api

Change-Id: I11f22dba5c795f7016c6dac950166ab749a7423d
2016-09-26 22:16:51 +01:00
Michael Wright
091ffac018 DO NOT MERGE Actually track generics in API definition.
Bug: 24265043
Test: make
Change-Id: Id5544c0f0cf32655f9c00a5cc3eca1cabb70170f
2016-09-26 19:38:14 +01:00
Treehugger Robot
fe9357f6e7 Merge changes from topic 'aosp-generics-api'
* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
2016-09-26 14:04:57 +00:00
Alan Viverette
6e37f8a077 Allow developer to override Material-style modes in picker dialogs am: 8817aa9339
am: 010ab618af

Change-Id: I0d68842adb7097f4d32977f31d80a10bc166c045
2016-09-23 19:43:39 +00:00
Alan Viverette
8817aa9339 Allow developer to override Material-style modes in picker dialogs
A recent fix prevented developers from specifying Holo-style mode when
displaying a date or time picker dialog. This CL also cleans up unused
code in TimePickerDialog and documents how themeResId will be used.

Adds hidden @TestApi methods for use in CTS tests. These may be made
public later, but it's too late in MR1 for API changes.

Bug: 31586821
Test: Ice2e203983769f1ea1cfa93105eb97b6fa5176b9
Change-Id: I1b7512b7647ddd7ab987beac2c0aef4fe7cc16bc
2016-09-22 11:16:22 -04:00
Neil Fuller
025813ad65 Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b
am: 8ed37211bd

Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae
2016-09-21 16:46:25 +00:00
Neil Fuller
8ed37211bd Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d
am: 3fa8bc066b

Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798
2016-09-21 16:28:46 +00:00
Neil Fuller
f2fb7521ab Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc am: 2d7008a71c
am: a70325bced

Change-Id: If4fbdf31e9b6c2cf418acb67866fb4096f1a0049
2016-09-21 12:03:29 +00:00
Neil Fuller
a70325bced Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc
am: 2d7008a71c

Change-Id: I931f4f0f5d9be7b11725ab42f5eefcb2770d70b6
2016-09-21 11:58:27 +00:00
Neil Fuller
3243958460 Track API changes associated with AbstractMethod refactoring
No actual API change.

Bug: 28666126
Bug: 31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04
2016-09-21 12:57:41 +01:00
Neil Fuller
3ead539c01 Tracking unhiding of java.lang.reflect.Parameter APIs
Bug: 28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
2016-09-21 09:21:10 +00:00
Michael Wright
b4fcc6136e DO NOT MERGE Track generics in API definition.
Bug: 24265043

Change-Id: Icd810adbfe93d542beeb00eeb9c3fb13cb97c0a5
2016-09-12 17:16:49 +01:00
Dianne Hackborn
a0e55c43c2 DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-09-12 17:16:44 +01:00
Tobias Thierer
91ca970dfc API: Update ResourceBundle to OpenJDK8u60
Test: make update-api

Change-Id: I1a7acbb02c633e46b237493b22d9d4d470945dd0
2016-09-12 17:07:20 +01:00
Tobias Thierer
e1edfb3008 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6 am: 24bd141ce0
am: 8cdc25b4b3

Change-Id: I83723322bfd4db3290fd831210ba1fc03c51e22a
2016-09-08 13:31:09 +00:00
Tobias Thierer
8cdc25b4b3 Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80d6
am: 24bd141ce0

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8
2016-09-08 13:26:11 +00:00
Tobias Thierer
63a07e80d6 Merge "Add Base64 from OpenJDK 8u60" 2016-09-08 13:10:15 +00:00
Sergio Giro
374edfe1f7 Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 am: 81749ef47f
am: fc0ee229bb

Change-Id: I6b998e9a89c75f4869fcae144a8ce8b7ea40bb34
2016-09-08 12:37:44 +00:00
Sergio Giro
fc0ee229bb Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920
am: 81749ef47f

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d
2016-09-08 12:32:42 +00:00
Sergio Giro
8445702920 Merge "java.security.Provider: port to jdk8u60 (second part)" 2016-09-08 12:18:43 +00:00
Yi Kong
c0579c5fb7 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7 am: b2d6acaa2b
am: 541b91fe64

Change-Id: I34d1dbc11268b935cd61204954ce56248346f888
2016-09-08 10:17:57 +00:00
Yi Kong
541b91fe64 Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f" am: 3bc37e9cf7
am: b2d6acaa2b

Change-Id: I756b0c2366737f22447ead5f26435ffb4b0425cb
2016-09-08 10:12:54 +00:00
Yi Kong
a4cc9028bf Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f
Bug: 30992227
Change-Id: I33c25562468f5803e211910f50116b501b66fe56
2016-09-07 16:17:55 +00:00
Sergio Giro
ff14a693b9 Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336
am: c0f7d4c65b

Change-Id: I02abf258533fe1b5f86d60f24d0bb2810cc5efc7
2016-09-07 12:34:04 +00:00
Sergio Giro
f0efc8fc28 Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748
am: 724155a3be

Change-Id: I1ba1e83b0610166f7ae89cd460ec7435853ccd4e
2016-09-07 12:33:57 +00:00
Sergio Giro
e043ec7917 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d am: 09a2121d5d
am: fcc05f0f66

Change-Id: I1b68d4f89349567a78935c4e50b2387db8acc9b0
2016-09-07 12:33:51 +00:00
Sergio Giro
c0f7d4c65b Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba
am: 6c753ca336

Change-Id: I3f6c8546ff116fbfcf11c0c0f5b168f56503e22f
2016-09-07 12:28:09 +00:00
Sergio Giro
724155a3be Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1
am: 52e0434748

Change-Id: I4e631cb3d354b2bba2dd0ced239edf60588d12a3
2016-09-07 12:28:00 +00:00
Sergio Giro
fcc05f0f66 Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d
am: 09a2121d5d

Change-Id: I8e2002564fbdc2aea638538bb8954e44d882900e
2016-09-07 12:27:54 +00:00
Sergio Giro
ebebc24c21 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8 am: 290f2bb2a0
am: 9fb957c4e5

Change-Id: Ia497ce4aec873aa9a74099f0dadbf9fe81424205
2016-09-07 12:27:51 +00:00
Sergio Giro
9fb957c4e5 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8
am: 290f2bb2a0

Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc
2016-09-07 12:23:41 +00:00
Sergio Giro
12d3d4bbba Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" 2016-09-07 12:08:27 +00:00
Sergio Giro
6767fd28b1 Merge "java.security.PKCS12Attribute: port class from jdk8u60" 2016-09-07 12:07:13 +00:00
Sergio Giro
4c2df18a4d Merge "java.security.SecureRandom: add getInstanceStrong() method" 2016-09-07 12:05:35 +00:00
Sergio Giro
59c0fcf0c8 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" 2016-09-07 12:04:21 +00:00