Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: 3cccd3d640

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23321178

Change-Id: I9f18c485195992019a1d346f68c4501b61447335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tim Yu
2023-05-19 15:56:43 +00:00
committed by Automerger Merge Worker
parent 3f938a4039 3cccd3d640
commit 28f350e337
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
View File

@@ -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;
}