commit 1f93cc6b3e79348951200bc003a472ebfe35d755
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Mon Jan 11 16:35:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 11 16:35:06 2016 +0000
tree f00684e5c774a76e29a9ca23f46666f9f6dcfd5c
parent f111ccf30e0cd4f3dd2e3045f907736dc33acc1f
parent 00f9b5c1c839fe54f7a1c64024052d35e9226ea8

Merge "AbstractPlainSocketImpl#close shouldn't set fd to null"

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 0ef43a7..dc840af 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -168,7 +168,7 @@
 LOCAL_CPPFLAGS += $(core_cppflags)
 LOCAL_SRC_FILES += $(core_test_files)
 LOCAL_C_INCLUDES += libcore/include
-LOCAL_SHARED_LIBRARIES += libcrypto libnativehelper
+LOCAL_SHARED_LIBRARIES += libnativehelper_compat_libc++
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libjavacoretests
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
@@ -278,7 +278,7 @@
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libjavacoretests
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
-    LOCAL_SHARED_LIBRARIES := libcrypto-host libnativehelper
+    LOCAL_SHARED_LIBRARIES := libnativehelper
     LOCAL_MULTILIB := both
     LOCAL_CXX_STL := libc++
     include $(BUILD_HOST_SHARED_LIBRARY)

ojluni/src/main/java/java/util/Formatter.java

diff --git a/ojluni/src/main/java/java/util/Formatter.java b/ojluni/src/main/java/java/util/Formatter.java
index c914bce..02e0132 100755
--- a/ojluni/src/main/java/java/util/Formatter.java
+++ b/ojluni/src/main/java/java/util/Formatter.java
@@ -2940,8 +2940,10 @@
         private void print(String s) throws IOException {
             if (precision != -1 && precision < s.length())
                 s = s.substring(0, precision);
-            if (f.contains(Flags.UPPERCASE))
-                s = s.toUpperCase();
+            if (f.contains(Flags.UPPERCASE)) {
+                // Always uppercase strings according to the provided locale.
+                s = s.toUpperCase(l != null ? l : Locale.getDefault());
+            }
             a.append(justify(s));
         }