From dd84e041cbf6cac16e4cca80d4ef18f3ad7f098f Mon Sep 17 00:00:00 2001 From: Prince Date: Tue, 25 Apr 2023 19:22:05 +0000 Subject: [PATCH 1/2] Log initial dock state of device on boot Fixes: b/246353053 Test: logging dock state Change-Id: I604b28d1a2d97f90e1d5f638820315b5cf13cc97 --- services/core/java/com/android/server/DockObserver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java index 5156c541011f9..fb527c1049467 100644 --- a/services/core/java/com/android/server/DockObserver.java +++ b/services/core/java/com/android/server/DockObserver.java @@ -37,6 +37,7 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.ExtconUEventObserver.ExtconInfo; import java.io.FileDescriptor; @@ -195,6 +196,8 @@ final class DockObserver extends SystemService { @Override public void onStart() { publishBinderService(TAG, new BinderService()); + // Logs dock state after setDockStateFromProviderLocked sets mReportedDockState + FrameworkStatsLog.write(FrameworkStatsLog.DOCK_STATE_CHANGED, mReportedDockState); } @Override @@ -256,7 +259,6 @@ final class DockObserver extends SystemService { + mReportedDockState); final int previousDockState = mPreviousDockState; mPreviousDockState = mReportedDockState; - // Skip the dock intent if not yet provisioned. final ContentResolver cr = getContext().getContentResolver(); if (!mDeviceProvisionedObserver.isDeviceProvisioned()) { From 63da86fe765c01d6998cc8c8edcff7d8e848081e Mon Sep 17 00:00:00 2001 From: Tim Yu Date: Thu, 18 May 2023 18:42:23 +0000 Subject: [PATCH 2/2] Fix failing Autofill CTS related to PCC. Cause: missing flag in pcc enable query that makes tests think PCC is enabled even when it's not. Fixes: 282996294 Test: android.autofillservice.cts.dialog.LoginActivityTest Change-Id: I337ad89e5ee782341049c40dc77a9e38f74f6d2c --- .../server/autofill/AutofillManagerServiceShellCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java index 4aeb4a4f84096..cd6de8749f479 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java @@ -349,7 +349,8 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand { private int isFieldDetectionServiceEnabled(PrintWriter pw) { final int userId = getNextIntArgRequired(); String name = mService.getFieldDetectionServiceName(userId); - boolean enabled = !TextUtils.isEmpty(name); + boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled(); + boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled; pw.println(enabled); return 0; }