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

Browse Source
This commit is contained in:
Tim Yu
2023-05-26 17:56:35 +00:00
committed by Android (Google) Code Review
parent 3b2782ac96 53f537f85a
commit 399285113c
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; 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 // Called by Shell command
String getFieldDetectionServiceName(@UserIdInt int userId) { String getFieldDetectionServiceName(@UserIdInt int userId) {
enforceCallingPermissionForManagement(); 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.ShellCommand;
import android.os.UserHandle; import android.os.UserHandle;
import android.service.autofill.AutofillFieldClassificationService.Scores; import android.service.autofill.AutofillFieldClassificationService.Scores;
import android.text.TextUtils;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import com.android.internal.os.IResultReceiver; import com.android.internal.os.IResultReceiver;
@@ -348,9 +347,7 @@ 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); boolean enabled = mService.isFieldDetectionServiceEnabledForUser(userId);
boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();
boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;
pw.println(enabled); pw.println(enabled);
return 0; return 0;
} }