Merge "Correct returns if PCC is enabled." into udc-dev (39928511) · Commits · e / os / android_frameworks_base

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

+12 −0

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

+1 −4

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