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

Commit 123a34f1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Renamed ViewStructure.setSanitized() to setDataIsSensitive()."

parents 00de0e64 c9a19b1b

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -25193,8 +25193,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -46248,6 +46248,7 @@ package android.view { 
    method public abstract void setClickable(boolean);

    method public abstract void setContentDescription(java.lang.CharSequence);

    method public abstract void setContextClickable(boolean);

    method public abstract void setDataIsSensitive(boolean);

    method public abstract void setDimens(int, int, int, int, int, int);

    method public abstract void setElevation(float);

    method public abstract void setEnabled(boolean);
@@ -46258,7 +46259,6 @@ package android.view { 
    method public abstract void setInputType(int);

    method public abstract void setLongClickable(boolean);

    method public abstract void setOpaque(boolean);

    method public abstract void setSanitized(boolean);

    method public abstract void setSelected(boolean);

    method public abstract void setText(java.lang.CharSequence);

    method public abstract void setText(java.lang.CharSequence, int, int);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -27312,8 +27312,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -49707,6 +49707,7 @@ package android.view { 
    method public abstract void setClickable(boolean);

    method public abstract void setContentDescription(java.lang.CharSequence);

    method public abstract void setContextClickable(boolean);

    method public abstract void setDataIsSensitive(boolean);

    method public abstract void setDimens(int, int, int, int, int, int);

    method public abstract void setElevation(float);

    method public abstract void setEnabled(boolean);
@@ -49717,7 +49718,6 @@ package android.view { 
    method public abstract void setInputType(int);

    method public abstract void setLongClickable(boolean);

    method public abstract void setOpaque(boolean);

    method public abstract void setSanitized(boolean);

    method public abstract void setSelected(boolean);

    method public abstract void setText(java.lang.CharSequence);

    method public abstract void setText(java.lang.CharSequence, int, int);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -25294,8 +25294,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -46615,6 +46615,7 @@ package android.view { 
    method public abstract void setClickable(boolean);

    method public abstract void setContentDescription(java.lang.CharSequence);

    method public abstract void setContextClickable(boolean);

    method public abstract void setDataIsSensitive(boolean);

    method public abstract void setDimens(int, int, int, int, int, int);

    method public abstract void setElevation(float);

    method public abstract void setEnabled(boolean);
@@ -46625,7 +46626,6 @@ package android.view { 
    method public abstract void setInputType(int);

    method public abstract void setLongClickable(boolean);

    method public abstract void setOpaque(boolean);

    method public abstract void setSanitized(boolean);

    method public abstract void setSelected(boolean);

    method public abstract void setText(java.lang.CharSequence);

    method public abstract void setText(java.lang.CharSequence, int, int);

core/java/android/app/assist/AssistStructure.java

+2 −2
Original line number Diff line number Diff line
@@ -1683,8 +1683,8 @@ public class AssistStructure implements Parcelable { 
        }



        @Override

        public void setSanitized(boolean sanitized) {

            mNode.mSanitized = sanitized;

        public void setDataIsSensitive(boolean sensitive) {

            mNode.mSanitized = !sensitive;

        }



        @Override

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -7257,9 +7257,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * Called when assist structure is being retrieved from a view as part of an autofill request.

     *

     * <p>This method already provides most of what's needed for autofill, but should be overridden

     * when:

     * <ol>

     * <li>The view contents does not include PII (Personally Identifiable Information), so it

     * can call {@link ViewStructure#setSanitized(boolean)} passing {@code true}.

     * can call {@link ViewStructure#setDataIsSensitive(boolean)} passing {@code false}.

     * <li>It must set fields such {@link ViewStructure#setText(CharSequence)},

     * {@link ViewStructure#setAutofillOptions(String[])}, or {@link ViewStructure#setUrl(String)}.

     * </ol>