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

Commit eb9a99c3 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Improved Autofill logging." into oc-dev 

am: 2d5c0d89

Change-Id: I222ecf081d1d841350191fcfe36aa457fdbeb305
parents ede868c0 2d5c0d89

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

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.service.autofill;



import static android.view.autofill.Helper.DEBUG;

import static android.view.autofill.Helper.sDebug;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -24,7 +24,6 @@ import android.content.IntentSender; 
import android.os.Parcel;

import android.os.Parcelable;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillValue;

import android.widget.RemoteViews;

import com.android.internal.util.Preconditions;
@@ -90,7 +89,7 @@ public final class Dataset implements Parcelable { 


    @Override

    public String toString() {

        if (!DEBUG) return super.toString();

        if (!sDebug) return super.toString();



        return new StringBuilder("Dataset " + mId + " [")

                .append("fieldIds=").append(mFieldIds)

core/java/android/service/autofill/FillContext.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.service.autofill;



import static android.view.autofill.Helper.DEBUG;

import static android.view.autofill.Helper.sDebug;



import android.annotation.NonNull;

import android.app.assist.AssistStructure;
@@ -74,7 +74,7 @@ public final class FillContext implements Parcelable { 


    @Override

    public String toString() {

        if (!DEBUG)  return super.toString();

        if (!sDebug)  return super.toString();



        return "FillContext [reqId=" + mRequestId + "]";

    }

core/java/android/service/autofill/FillResponse.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.service.autofill;



import static android.service.autofill.FillRequest.INVALID_REQUEST_ID;

import static android.view.autofill.Helper.DEBUG;

import static android.view.autofill.Helper.sDebug;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -394,7 +394,7 @@ public final class FillResponse implements Parcelable { 
    /////////////////////////////////////

    @Override

    public String toString() {

        if (!DEBUG) return super.toString();

        if (!sDebug) return super.toString();



        return new StringBuilder(

                "FillResponse : [mRequestId=" + mRequestId)

core/java/android/service/autofill/SaveInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.service.autofill;



import static android.view.autofill.Helper.DEBUG;

import static android.view.autofill.Helper.sDebug;



import android.annotation.IntDef;

import android.annotation.NonNull;
@@ -387,7 +387,7 @@ public final class SaveInfo implements Parcelable { 
    /////////////////////////////////////

    @Override

    public String toString() {

        if (!DEBUG) return super.toString();

        if (!sDebug) return super.toString();



        return new StringBuilder("SaveInfo: [type=")

                .append(DebugUtils.flagsToString(SaveInfo.class, "SAVE_DATA_TYPE_", mType))

core/java/android/view/autofill/AutofillId.java

+1 −5
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package android.view.autofill;



import static android.view.autofill.Helper.DEBUG;



import android.os.Parcel;

import android.os.Parcelable;

import android.view.View;
@@ -92,11 +90,9 @@ public final class AutofillId implements Parcelable { 


    @Override

    public String toString() {

        if (!DEBUG) return super.toString();



        final StringBuilder builder = new StringBuilder().append(mViewId);

        if (mVirtual) {

            builder.append(":").append(mVirtualId);

            builder.append(':').append(mVirtualId);

        }

        return builder.toString();

    }