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

Merge "Correct returns if PCC is enabled." into udc-dev am: 399285113c

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

Change-Id: Ia0f173248ecbbb9bf654c2579ae6fdd1cc569472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tim Yu
2023-05-26 18:52:01 +00:00
committed by Automerger Merge Worker
parent 862148d64a 399285113c
commit bced26aaa6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/autofill/java/com/android/server/autofill/AutofillManagerService.java
View File

@@ -760,6 +760,18 @@ public final class AutofillManagerService
return false;
}
// Called by Shell command
boolean isFieldDetectionServiceEnabledForUser(@UserIdInt int userId) {
enforceCallingPermissionForManagement();
synchronized (mLock) {
final AutofillManagerServiceImpl service = getServiceForUserLocked(userId);
if (service != null) {
return service.isPccClassificationEnabled();
}
}
return false;
}
// Called by Shell command
String getFieldDetectionServiceName(@UserIdInt int userId) {
enforceCallingPermissionForManagement();

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

@@ -26,7 +26,6 @@ import android.os.RemoteCallback;
import android.os.ShellCommand;
import android.os.UserHandle;
import android.service.autofill.AutofillFieldClassificationService.Scores;
import android.text.TextUtils;
import android.view.autofill.AutofillManager;
import com.android.internal.os.IResultReceiver;
@@ -348,9 +347,7 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
private int isFieldDetectionServiceEnabled(PrintWriter pw) {
final int userId = getNextIntArgRequired();
String name = mService.getFieldDetectionServiceName(userId);
boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();
boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;
boolean enabled = mService.isFieldDetectionServiceEnabledForUser(userId);
pw.println(enabled);
return 0;
}