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

Commit 9b53f411 authored by TYM Tsai's avatar TYM Tsai
Browse files

Add getter for filter in Field 

Add getFilter method to retrieve filter set by setFilter.

Bug: 217554272
Test: atest DatasetTest
Change-Id: I70a5c2f332c656f453cb0992f89d76879bfa7412
parent 038fd80c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38067,6 +38067,7 @@ package android.service.autofill { 
  }















  public final class Field {













    method @Nullable public java.util.regex.Pattern getFilter();















    method @Nullable public android.service.autofill.Presentations getPresentations();















    method @Nullable public android.view.autofill.AutofillValue getValue();















  }

























core/java/android/service/autofill/Dataset.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -905,7 +905,7 @@ public final class Dataset implements Parcelable {













            if (field == null) {















                setLifeTheUniverseAndEverything(id, null, null, null, null, null, null);















            } else {













                final DatasetFieldFilter filter = field.getFilter();













                final DatasetFieldFilter filter = field.getDatasetFieldFilter();















                final Presentations presentations = field.getPresentations();















                if (presentations == null) {















                    setLifeTheUniverseAndEverything(id, field.getValue(), null, null, null,

































core/java/android/service/autofill/Field.java



+11
−3




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.service.autofill;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.SuppressLint;















import android.view.autofill.AutofillId;















import android.view.autofill.AutofillValue;


























@@ -86,10 +85,20 @@ public final class Field {













     * @see Dataset.DatasetFieldFilter















     * @hide















     */













    public @Nullable Dataset.DatasetFieldFilter getFilter() {













    public @Nullable Dataset.DatasetFieldFilter getDatasetFieldFilter() {















        return mFilter;















    }





























    /**













     * Regex used to determine if the dataset should be shown in the autofill UI;













     * when {@code null}, it disables filtering on that dataset (this is the recommended













     * approach when {@code value} is not {@code null} and field contains sensitive data













     * such as passwords).













     */













    public @Nullable Pattern getFilter() {













        return mFilter == null ? null : mFilter.pattern;













    }





























    /**















     * The presentations used to visualize this field in Autofill UI.















     */










@@ -127,7 +136,6 @@ public final class Field {













         * approach when {@code value} is not {@code null} and field contains sensitive data















         * such as passwords).















         */













        @SuppressLint("MissingGetterMatchingBuilder")















        public @NonNull Builder setFilter(@Nullable Pattern value) {















            checkNotUsed();















            mFilter = new Dataset.DatasetFieldFilter(value);