diff options
| author | Adam He <adamhe@google.com> | 2019-03-05 14:20:44 -0800 |
|---|---|---|
| committer | Adam He <adamhe@google.com> | 2019-03-05 14:51:30 -0800 |
| commit | 70ebc5a508f14f14a3d8de0193043b30f70ca2d6 (patch) | |
| tree | 49369f41577a26e5845a672563c0c4f2f681b74f /core/java/android/content/AutofillOptions.java | |
| parent | 6240eab185975e63c45f3445a9628b0b30cd0c56 (diff) | |
Check for empty arguments in setWhitelist().
Bug: 125348180
Test: atest CtsContentCaptureServiceTestCases
Test: atest FrameworksCoreTests:com.android.internal.infra.WhitelistHelperTest
Change-Id: I9c2296ebe2762e97f03350b365b148429b15ab60
Diffstat (limited to 'core/java/android/content/AutofillOptions.java')
| -rw-r--r-- | core/java/android/content/AutofillOptions.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/AutofillOptions.java b/core/java/android/content/AutofillOptions.java index ba556cced3c5..f59bc9891c86 100644 --- a/core/java/android/content/AutofillOptions.java +++ b/core/java/android/content/AutofillOptions.java @@ -71,12 +71,14 @@ public final class AutofillOptions implements Parcelable { * Returns whether activity is whitelisted for augmented autofill. */ public boolean isAugmentedAutofillEnabled(@NonNull Context context) { + if (!augmentedAutofillEnabled) return false; + final ContentCaptureClient contentCaptureClient = context.getContentCaptureClient(); if (contentCaptureClient == null) return false; final ComponentName component = contentCaptureClient.contentCaptureClientGetComponentName(); - return augmentedAutofillEnabled && (whitelistedActivitiesForAugmentedAutofill == null - || whitelistedActivitiesForAugmentedAutofill.contains(component)); + return whitelistedActivitiesForAugmentedAutofill == null + || whitelistedActivitiesForAugmentedAutofill.contains(component); } /** |