Commit eb0f91b0 authored May 19, 2023 by Tim Yu Committed by Automerger Merge Worker May 19, 2023

Merge "Fix failing Autofill CTS related to PCC. Cause: missing flag in pcc...

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: b0f15c0c am: 50d60ba5 am: e6093e0e am: 49e80fa4

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>

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}