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

Commit f70c9346 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Use factory methods for RestrictionEntry 

As per API council request, factory methods should be used instead of using
boolean.

Bug: 21343772
Change-Id: Ia0889e46916f4ed7edb942217880cdf9c27771c2
parent 8e9d7d55

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8559,8 +8559,9 @@ package android.content { 
    ctor public RestrictionEntry(java.lang.String, boolean);

    ctor public RestrictionEntry(java.lang.String, java.lang.String[]);

    ctor public RestrictionEntry(java.lang.String, int);

    ctor public RestrictionEntry(java.lang.String, android.content.RestrictionEntry[], boolean);

    ctor public RestrictionEntry(android.os.Parcel);

    method public static android.content.RestrictionEntry createBundleArrayEntry(java.lang.String, android.content.RestrictionEntry[]);

    method public static android.content.RestrictionEntry createBundleEntry(java.lang.String, android.content.RestrictionEntry[]);

    method public int describeContents();

    method public java.lang.String[] getAllSelectedStrings();

    method public java.lang.String[] getChoiceEntries();

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -8791,8 +8791,9 @@ package android.content { 
    ctor public RestrictionEntry(java.lang.String, boolean);

    ctor public RestrictionEntry(java.lang.String, java.lang.String[]);

    ctor public RestrictionEntry(java.lang.String, int);

    ctor public RestrictionEntry(java.lang.String, android.content.RestrictionEntry[], boolean);

    ctor public RestrictionEntry(android.os.Parcel);

    method public static android.content.RestrictionEntry createBundleArrayEntry(java.lang.String, android.content.RestrictionEntry[]);

    method public static android.content.RestrictionEntry createBundleEntry(java.lang.String, android.content.RestrictionEntry[]);

    method public int describeContents();

    method public java.lang.String[] getAllSelectedStrings();

    method public java.lang.String[] getChoiceEntries();

core/java/android/content/RestrictionEntry.java

+24 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class RestrictionEntry implements Parcelable { 
     * {@link #TYPE_BUNDLE_ARRAY bundle-array} type, otherwise the type will be set to

     * {@link #TYPE_BUNDLE bundle}.

     */

    public RestrictionEntry(String key, RestrictionEntry[] restrictionEntries,

    private RestrictionEntry(String key, RestrictionEntry[] restrictionEntries,

            boolean isBundleArray) {

        mKey = key;

        if (isBundleArray) {
@@ -219,6 +219,29 @@ public class RestrictionEntry implements Parcelable { 
        setRestrictions(restrictionEntries);

    }



    /**

     * Creates an entry of type {@link #TYPE_BUNDLE}.

     * @param key the unique key for this restriction

     * @param restrictionEntries array of nested restriction entries.

     * @return the newly created restriction

     */

    public static RestrictionEntry createBundleEntry(String key,

            RestrictionEntry[] restrictionEntries) {

        return new RestrictionEntry(key, restrictionEntries, false);

    }



    /**

     * Creates an entry of type {@link #TYPE_BUNDLE_ARRAY}.

     * @param key the unique key for this restriction

     * @param restrictionEntries array of nested restriction entries. The array may only contain

     * elements of type {@link #TYPE_BUNDLE bundle}.

     * @return the newly created restriction

     */

    public static RestrictionEntry createBundleArrayEntry(String key,

            RestrictionEntry[] restrictionEntries) {

        return new RestrictionEntry(key, restrictionEntries, true);

    }



    /**

     * Sets the type for this restriction.

     * @param type the type for this restriction.