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

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

Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev am: c21f723c 

am: 977cbc66

Change-Id: Ibc07c8b9b614e5fbfc1fbedd609f45f1a2fe7398
parents da3d2871 977cbc66

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47806,7 +47806,7 @@ package android.view.autofill { 
    method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback);

    field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";

    field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";

    field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS";

    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE";

  }















  public static abstract class AutofillManager.AutofillCallback {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -51402,7 +51402,7 @@ package android.view.autofill {













    method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback);















    field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";















    field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";













    field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS";













    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE";















  }





























  public static abstract class AutofillManager.AutofillCallback {

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -48201,7 +48201,7 @@ package android.view.autofill {













    method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback);















    field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";















    field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";













    field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS";













    field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE";















  }





























  public static abstract class AutofillManager.AutofillCallback {

























core/java/android/view/autofill/AutofillManager.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -94,7 +94,8 @@ public final class AutofillManager {













     * <p>















     * Type: {@link android.os.Bundle}















     */













    public static final String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS";













    public static final String EXTRA_CLIENT_STATE =













            "android.view.autofill.extra.EXTRA_CLIENT_STATE";































    static final String SESSION_ID_TAG = "android:sessionId";















    static final String LAST_AUTOFILLED_DATA_TAG = "android:lastAutoFilledData";

































services/autofill/java/com/android/server/autofill/Session.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1253,7 +1253,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState













        final Intent fillInIntent = new Intent();















        fillInIntent.putExtra(AutofillManager.EXTRA_ASSIST_STRUCTURE, structure);















        if (extras != null) {













            fillInIntent.putExtra(AutofillManager.EXTRA_DATA_EXTRAS, extras);













            fillInIntent.putExtra(AutofillManager.EXTRA_CLIENT_STATE, extras);















        }















        return fillInIntent;















    }