Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f537f8 authored by Tim Yu's avatar Tim Yu
Browse files

Correct returns if PCC is enabled. 

Before it was just using the general flags to see if the PCC enabled and
PCC service names are set to determine if PCC is enabled. This change
will get those values for the user instead.

Fixes: 283849162
Test: android.autofillservice.cts.dialog.LoginActivityTest
Change-Id: Id9baa2611ad9d1a8abf05896604609d2e35b7947
parent 63da86fe

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();

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

+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;

    }