Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 475aa109 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Un-hide string set persistence methods in Preference" into nyc-dev

parents 074d630f 5c2f8399

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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<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();
@@ -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<java.lang.String>);

    method public void restoreHierarchyState(android.os.Bundle);

    method public void saveHierarchyState(android.os.Bundle);

    method public void setDefaultValue(java.lang.Object);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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<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();
@@ -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<java.lang.String>);

    method public void restoreHierarchyState(android.os.Bundle);

    method public void saveHierarchyState(android.os.Bundle);

    method public void setDefaultValue(java.lang.Object);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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<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();
@@ -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<java.lang.String>);

    method public void restoreHierarchyState(android.os.Bundle);

    method public void saveHierarchyState(android.os.Bundle);

    method public void setDefaultValue(java.lang.Object);

core/java/android/preference/Preference.java

+3 −7
Original line number Diff line number Diff line
@@ -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;

        }