From 45716d6539cc64267bc46e71308c0c21c39f65e0 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Thu, 22 Sep 2016 17:49:45 +0100
Subject: [PATCH] API changes for Locale to OpenJDK8u60 (part 1/2)

Bug: 29935305

Test: make update-api

Change-Id: I11f22dba5c795f7016c6dac950166ab749a7423d
---
 api/current.txt        | 2 ++
 api/system-current.txt | 2 ++
 api/test-current.txt   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 8a38b2136bca9..7728804baaf2f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -59113,8 +59113,10 @@ package java.util {
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;
diff --git a/api/system-current.txt b/api/system-current.txt
index 175ec87ed399a..6820a954da893 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -62469,8 +62469,10 @@ package java.util {
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;
diff --git a/api/test-current.txt b/api/test-current.txt
index 3544efbce3eb8..c7652d3473071 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -59193,8 +59193,10 @@ package java.util {
     method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
     method public java.lang.String getUnicodeLocaleType(java.lang.String);
     method public java.lang.String getVariant();
+    method public boolean hasExtensions();
     method public static synchronized void setDefault(java.util.Locale);
     method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+    method public java.util.Locale stripExtensions();
     method public java.lang.String toLanguageTag();
     method public final java.lang.String toString();
     field public static final java.util.Locale CANADA;