diff --git a/api/current.txt b/api/current.txt index 21d2645621c1e..e01ddb62ee23c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29547,6 +29547,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 getPersistedStringSet(java.util.Set); method public android.preference.PreferenceManager getPreferenceManager(); method public android.content.SharedPreferences getSharedPreferences(); method public boolean getShouldDisableView(); @@ -29581,6 +29582,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); 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 351d58051c063..87990e3ecebc7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -31916,6 +31916,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 getPersistedStringSet(java.util.Set); method public android.preference.PreferenceManager getPreferenceManager(); method public android.content.SharedPreferences getSharedPreferences(); method public boolean getShouldDisableView(); @@ -31950,6 +31951,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); 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 82176ae705558..5cfbf63e2b805 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -29557,6 +29557,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 getPersistedStringSet(java.util.Set); method public android.preference.PreferenceManager getPreferenceManager(); method public android.content.SharedPreferences getSharedPreferences(); method public boolean getShouldDisableView(); @@ -29591,6 +29592,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); 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 5d64af577cba6..d41bc070d6c15 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -1494,11 +1494,9 @@ public class Preference implements Comparable { * @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 values) { + public boolean persistStringSet(Set values) { if (shouldPersist()) { // Shouldn't store null if (values.equals(getPersistedStringSet(null))) { @@ -1527,10 +1525,8 @@ public class Preference implements Comparable { * @return The value from the SharedPreferences or the default return * value. * @see #persistStringSet(Set) - * - * @hide Pending API approval */ - protected Set getPersistedStringSet(Set defaultReturnValue) { + public Set getPersistedStringSet(Set defaultReturnValue) { if (!shouldPersist()) { return defaultReturnValue; }