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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23321178 Change-Id: I33e1b7a217660e0840819ef777b771577bc21744 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -349,7 +349,8 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
|
|||||||
private int isFieldDetectionServiceEnabled(PrintWriter pw) {
|
private int isFieldDetectionServiceEnabled(PrintWriter pw) {
|
||||||
final int userId = getNextIntArgRequired();
|
final int userId = getNextIntArgRequired();
|
||||||
String name = mService.getFieldDetectionServiceName(userId);
|
String name = mService.getFieldDetectionServiceName(userId);
|
||||||
boolean enabled = !TextUtils.isEmpty(name);
|
boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();
|
||||||
|
boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;
|
||||||
pw.println(enabled);
|
pw.println(enabled);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user