Merge Scanner from jdk-17.0.5-ga into the aosp/master branch
Scanner(InputStream, String) behaviour was slightly changed -
now it converts String into Charset and calls
Scanner(InputStream, Charset), so when both arguments are null
it complains about charset being null and throws IAE, instead
of previous behaviour when NPE (as InputStream is null) was
thrown. JavaDoc does not specify exact behaviour here, hence
I just updated ScannerTest.
List of files:
ojluni/src/main/java/java/util/Scanner.java
ojluni/src/test/java/util/Scanner/EncodingTest.java
ojluni/src/test/java/util/Scanner/FailingConstructors.java
ojluni/src/test/java/util/Scanner/ScanTest.java
ojluni/src/test/java/util/Scanner/ScannerStreamTest.java
ojluni/src/test/java/util/Scanner/input.txt
Bug: 260683419
Test: CtsLibcoreOjTestCases
Test: CtsLibcoreTestCases
Change-Id: I5b90ceee9c1802a9e47c89a74a5814770dc5031d