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

Commit 47b37aa0 authored by Svet Ganov's avatar Svet Ganov Committed by Felipe Leme
Browse files

Minor autofill changes to support compat mode CTS tests. 

Bug: 72811561
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest

Change-Id: I6ec2563cea75afc77a1598805988d8e6c433c574
parent 385ccb10

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ package android.content { 
  public abstract class Context {

    method public android.os.UserHandle getUser();

    method public int getUserId();

    method public void setAutofillCompatibilityEnabled(boolean);

  }



}
@@ -532,6 +533,7 @@ package android.provider { 
  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    field public static final java.lang.String AUTOFILL_COMPAT_ALLOWED_PACKAGES = "autofill_compat_allowed_packages";

    field public static final java.lang.String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";

    field public static final java.lang.String LOW_POWER_MODE = "low_power";

    field public static final java.lang.String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";

core/java/android/app/Activity.java

+2 −0
Original line number Diff line number Diff line
@@ -6343,6 +6343,8 @@ public class Activity extends ContextThemeWrapper 


        final AutofillManager afm = getAutofillManager();

        if (afm != null) {

            writer.print(prefix); writer.print("Autofill Compat Mode: ");

            writer.println(isAutofillCompatibilityEnabled());

            afm.dump(prefix, writer);

        } else {

            writer.print(prefix); writer.println("No AutofillManager");

core/java/android/app/ContextImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentProvider;
@@ -2264,6 +2265,7 @@ class ContextImpl extends Context { 
    }



    /** @hide */

    @TestApi

    @Override

    public void setAutofillCompatibilityEnabled(boolean autofillCompatEnabled) {

        mIsAutofillCompatEnabled = autofillCompatEnabled;

core/java/android/content/Context.java

+4 −2
Original line number Diff line number Diff line
@@ -4919,7 +4919,7 @@ public abstract class Context { 
    /**

     * @hide

     */

    public void setAutofillClient(AutofillClient client) {

    public void setAutofillClient(@SuppressWarnings("unused") AutofillClient client) {

    }



    /**
@@ -4932,7 +4932,9 @@ public abstract class Context { 
    /**

     * @hide

     */

    public void setAutofillCompatibilityEnabled(boolean autofillCompatEnabled) {

    @TestApi

    public void setAutofillCompatibilityEnabled(

            @SuppressWarnings("unused") boolean autofillCompatEnabled) {

    }



    /**

core/java/android/content/ContextWrapper.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.content;



import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.IApplicationThread;

import android.app.IServiceConnection;

import android.content.pm.ApplicationInfo;
@@ -1006,6 +1007,7 @@ public class ContextWrapper extends Context { 
    /**

     * @hide

     */

    @TestApi

    @Override

    public void setAutofillCompatibilityEnabled(boolean  autofillCompatEnabled) {

        if (mBase != null) {