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

Commit 969ec600 authored by Prince Donkor's avatar Prince Donkor Committed by Automerger Merge Worker
Browse files

Merge "Log initial dock state of device on boot" into udc-dev am: be150360 

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



Change-Id: Ie5d6278b7e1ba01d6ab73cc31c6fe5e2dce0495a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f225e822 be150360

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }

services/core/java/com/android/server/DockObserver.java

+3 −1
Original line number Diff line number Diff line
@@ -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()) {