diff options
| author | 2023-05-19 16:33:03 +0000 | |
|---|---|---|
| committer | 2023-05-19 16:33:03 +0000 | |
| commit | eb0f91b0e0a261851f8652a8e4fc6c32d0f6738c (patch) | |
| tree | 87bb906a8191028859d514a343a32075506fd0a3 | |
| parent | 5f3d40258f8057af80a07d5ced1fd89e346c2da1 (diff) | |
| parent | 49e80fa4448594346cd85860d3dcab7ffeaaf4b2 (diff) | |
Merge "Fix failing Autofill CTS related to PCC. Cause: missing flag in pcc enable query that makes tests think PCC is enabled even when it's not." into udc-dev am: b0f15c0c77 am: 50d60ba536 am: e6093e0e05 am: 49e80fa444
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23321178
Change-Id: I51a8255703e00274222f3bbc25ab06d10b2e0802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java index 4aeb4a4f8409..cd6de8749f47 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java @@ -349,7 +349,8 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand { private int isFieldDetectionServiceEnabled(PrintWriter pw) { final int userId = getNextIntArgRequired(); String name = mService.getFieldDetectionServiceName(userId); - boolean enabled = !TextUtils.isEmpty(name); + boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled(); + boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled; pw.println(enabled); return 0; } |