From 5c2f839971aaac2bc7cfd98a61e0eb0e04340a9e Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 23 Feb 2016 16:06:42 -0800
Subject: [PATCH] Un-hide string set persistence methods in Preference

6 years is enough time for API approval.

Bug 27324328

Change-Id: I5d5af0fc291250cd9ea5b50cd5031378475eacec
---
 api/current.txt                              |  2 ++
 api/system-current.txt                       |  2 ++
 api/test-current.txt                         |  2 ++
 core/java/android/preference/Preference.java | 10 +++-------
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index b0279121f392..c564fa309e07 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29525,6 +29525,7 @@ package android.preference {
     method protected int getPersistedInt(int);
     method protected long getPersistedLong(long);
     method protected java.lang.String getPersistedString(java.lang.String);
+    method public java.util.Set<java.lang.String> getPersistedStringSet(java.util.Set<java.lang.String>);
     method public android.preference.PreferenceManager getPreferenceManager();
     method public android.content.SharedPreferences getSharedPreferences();
     method public boolean getShouldDisableView();
@@ -29559,6 +29560,7 @@ package android.preference {
     method protected boolean persistInt(int);
     method protected boolean persistLong(long);
     method protected boolean persistString(java.lang.String);
+    method public boolean persistStringSet(java.util.Set<java.lang.String>);
     method public void restoreHierarchyState(android.os.Bundle);
     method public void saveHierarchyState(android.os.Bundle);
     method public void setDefaultValue(java.lang.Object);
diff --git a/api/system-current.txt b/api/system-current.txt
index 25b0cc24c76e..b4cd6a54a2ac 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -31895,6 +31895,7 @@ package android.preference {
     method protected int getPersistedInt(int);
     method protected long getPersistedLong(long);
     method protected java.lang.String getPersistedString(java.lang.String);
+    method public java.util.Set<java.lang.String> getPersistedStringSet(java.util.Set<java.lang.String>);
     method public android.preference.PreferenceManager getPreferenceManager();
     method public android.content.SharedPreferences getSharedPreferences();
     method public boolean getShouldDisableView();
@@ -31929,6 +31930,7 @@ package android.preference {
     method protected boolean persistInt(int);
     method protected boolean persistLong(long);
     method protected boolean persistString(java.lang.String);
+    method public boolean persistStringSet(java.util.Set<java.lang.String>);
     method public void restoreHierarchyState(android.os.Bundle);
     method public void saveHierarchyState(android.os.Bundle);
     method public void setDefaultValue(java.lang.Object);
diff --git a/api/test-current.txt b/api/test-current.txt
index a8a9f4cbb72f..b8caf6b4ac6d 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -29535,6 +29535,7 @@ package android.preference {
     method protected int getPersistedInt(int);
     method protected long getPersistedLong(long);
     method protected java.lang.String getPersistedString(java.lang.String);
+    method public java.util.Set<java.lang.String> getPersistedStringSet(java.util.Set<java.lang.String>);
     method public android.preference.PreferenceManager getPreferenceManager();
     method public android.content.SharedPreferences getSharedPreferences();
     method public boolean getShouldDisableView();
@@ -29569,6 +29570,7 @@ package android.preference {
     method protected boolean persistInt(int);
     method protected boolean persistLong(long);
     method protected boolean persistString(java.lang.String);
+    method public boolean persistStringSet(java.util.Set<java.lang.String>);
     method public void restoreHierarchyState(android.os.Bundle);
     method public void saveHierarchyState(android.os.Bundle);
     method public void setDefaultValue(java.lang.Object);
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index 5d64af577cba..d41bc070d6c1 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -1494,11 +1494,9 @@ public class Preference implements Comparable<Preference> {
      * @return True if the Preference is persistent. (This is not whether the
      *         value was persisted, since we may not necessarily commit if there
      *         will be a batch commit later.)
-     * @see #getPersistedString(Set)
-     * 
-     * @hide Pending API approval
+     * @see #getPersistedStringSet(Set)
      */
-    protected boolean persistStringSet(Set<String> values) {
+    public boolean persistStringSet(Set<String> values) {
         if (shouldPersist()) {
             // Shouldn't store null
             if (values.equals(getPersistedStringSet(null))) {
@@ -1527,10 +1525,8 @@ public class Preference implements Comparable<Preference> {
      * @return The value from the SharedPreferences or the default return
      *         value.
      * @see #persistStringSet(Set)
-     * 
-     * @hide Pending API approval
      */
-    protected Set<String> getPersistedStringSet(Set<String> defaultReturnValue) {
+    public Set<String> getPersistedStringSet(Set<String> defaultReturnValue) {
         if (!shouldPersist()) {
             return defaultReturnValue;
         }
-- 
2.11.0