diff options
| author | TYM Tsai <tymtsai@google.com> | 2022-02-18 18:12:56 +0800 |
|---|---|---|
| committer | TYM Tsai <tymtsai@google.com> | 2022-02-24 00:34:54 +0800 |
| commit | 261ac24929bc427264c755d402e656ca75c0c1a3 (patch) | |
| tree | 8b660da93cb4476e8acb959236329fe00554276b /core/java/android | |
| parent | 038fd80ce8b34d30bbd4ae8084f085b38ab34ca0 (diff) | |
Make fill dialog feature controlled by device config
Use device config to control whether autofill dialog feature is enabled.
To support this, the autofill namespace of DeviceConfig needs to be exposed
for AutofillManager to read in the app thread.
There are augmented_autofill_mode, smart_suggestion_supported_modes and
compat_mode_allowed_packages existed in autofill space. These can be made
app readable.
Bug: 210926084
Test: atest android.autofillservice.cts.dialog.LoginActivityTest
Change-Id: Idfb846656a0c26eba1db4f8ef6ec427ae4ca666d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/autofill/AutofillManager.java | 25 |
2 files changed, 24 insertions, 3 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 87f4489e30f8..52b6944ba940 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -586,7 +586,7 @@ public final class DeviceConfig { @NonNull private static final List<String> PUBLIC_NAMESPACES = Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA, - NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR); + NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR, NAMESPACE_AUTOFILL); /** * Privacy related properties definitions. * diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index b7994db0cb28..a8cc114c4d69 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -58,6 +58,7 @@ import android.os.Looper; import android.os.Parcelable; import android.os.RemoteException; import android.os.SystemClock; +import android.provider.DeviceConfig; import android.service.autofill.AutofillService; import android.service.autofill.FillCallback; import android.service.autofill.FillEventHistory; @@ -491,6 +492,15 @@ public final class AutofillManager { public static final String DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "compat_mode_allowed_packages"; + /** + * Sets the fill dialog feature enabled or not. + * + * @hide + */ + @TestApi + public static final String DEVICE_CONFIG_AUTOFILL_DIALOG_ENABLED = + "autofill_dialog_enabled"; + /** @hide */ public static final int RESULT_OK = 0; /** @hide */ @@ -539,7 +549,7 @@ public final class AutofillManager { */ public static final int NO_SESSION = Integer.MAX_VALUE; - private static final boolean HAS_FILL_DIALOG_UI_FEATURE = false; + private static final boolean HAS_FILL_DIALOG_UI_FEATURE_DEFAULT = false; private final IAutoFillManager mService; @@ -655,6 +665,8 @@ public final class AutofillManager { @Nullable private List<AutofillId> mFillDialogTriggerIds; + private final boolean mIsFillDialogEnabled; + /** @hide */ public interface AutofillClient { /** @@ -795,6 +807,14 @@ public final class AutofillManager { mIsFillRequested = false; mRequireAutofill = false; + mIsFillDialogEnabled = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_AUTOFILL, + DEVICE_CONFIG_AUTOFILL_DIALOG_ENABLED, + HAS_FILL_DIALOG_UI_FEATURE_DEFAULT); + if (sDebug) { + Log.d(TAG, "Fill dialog is enabled:" + mIsFillDialogEnabled); + } + if (mOptions != null) { sDebug = (mOptions.loggingLevel & FLAG_ADD_CLIENT_DEBUG) != 0; sVerbose = (mOptions.loggingLevel & FLAG_ADD_CLIENT_VERBOSE) != 0; @@ -1081,7 +1101,7 @@ public final class AutofillManager { } private boolean hasFillDialogUiFeature() { - return HAS_FILL_DIALOG_UI_FEATURE; + return mIsFillDialogEnabled; } /** @@ -3012,6 +3032,7 @@ public final class AutofillManager { } pw.print(pfx); pw.print("compat mode enabled: "); synchronized (mLock) { + pw.print(pfx); pw.print("fill dialog enabled: "); pw.println(mIsFillDialogEnabled); if (mCompatibilityBridge != null) { final String pfx2 = pfx + " "; pw.println("true"); |
