diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2023-10-13 13:01:16 +0100 |
|---|---|---|
| committer | Almaz Mingaleev <mingaleev@google.com> | 2023-10-25 16:14:16 +0100 |
| commit | a2f8648b6acd2314758bb69470f55879d69b5d90 (patch) | |
| tree | 7f8b3e190c37a31e80f739fa0e76b4d1cc28f6f4 /openjdk_java_files.bp | |
| parent | a0c117aa28a0d13ff46d70e4f73b1a84d400100e (diff) | |
| parent | 447f1275003abc81676e54eb1c33def212159773 (diff) | |
| download | libcore-a2f8648b6acd2314758bb69470f55879d69b5d90.tar.gz | |
Merge files from jdk-17.0.6-ga into the aosp/main branch
List of files:
ojluni/src/main/java/java/util/Properties.java
ojluni/src/main/java/java/util/PropertyPermission.java
ojluni/src/main/java/java/util/PropertyResourceBundle.java
ojluni/src/main/java/sun/util/PropertyResourceBundleCharset.java
Properties class was changed - it now stores mapping in CHM, not
in the Hashtable superclass. Corresponding methods were overridden
in System.PropertiesWithNonOverrideableDefaults to keep default
mappings unmodifiable.
ProviderTest#testForEachCME was removed as it relied on
implentation of the backing storage. Now CHM is used and it does
not throw CME, unlike Hashtable.
Bug: 259671905
Test: atest CtsLibcoreOjTestCases
Change-Id: I2767d9cd23db59780df86df280d3f4765b85c05b
Diffstat (limited to 'openjdk_java_files.bp')
| -rw-r--r-- | openjdk_java_files.bp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openjdk_java_files.bp b/openjdk_java_files.bp index 4a40d03446f..4dd79504f3c 100644 --- a/openjdk_java_files.bp +++ b/openjdk_java_files.bp @@ -1882,6 +1882,7 @@ filegroup { "ojluni/src/main/java/sun/util/logging/LoggingProxy.java", "ojluni/src/main/java/sun/util/logging/LoggingSupport.java", "ojluni/src/main/java/sun/util/logging/PlatformLogger.java", + "ojluni/src/main/java/sun/util/PropertyResourceBundleCharset.java", "ojluni/src/main/java/sun/util/ResourceBundleEnumeration.java", "ojluni/src/main/java/sun/util/resources/OpenListResourceBundle.java", "ojluni/src/main/java/jdk/internal/math/DoubleConsts.java", |