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

Commit 651cf244 authored by Tim Yu's avatar Tim Yu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I104e70940724dbffdee7a39e7b9524dbdc756d08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 863bfab5 39928511

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;

    }