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

Commit f85e47bb authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Log initial dock state of device on boot" into udc-dev am: be150360" into udc-d1-dev
parents 3cccd3d6 969ec600

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