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

Commit 9fa4add3 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... 

Merge "Log initial dock state of device on boot" into udc-dev am: be150360 am: 78d6c2cc am: fda76ef3 am: 7e07e6fa

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



Change-Id: I5552eac98b82f7d2d68be6c619251805eaba89c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb0f91b0 7e07e6fa

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import android.util.Slog; 




import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.ExtconUEventObserver.ExtconInfo;

import com.android.server.ExtconUEventObserver.ExtconInfo;





import java.io.FileDescriptor;

import java.io.FileDescriptor;
@@ -194,6 +195,8 @@ final class DockObserver extends SystemService { 
    @Override

    @Override

    public void onStart() {

    public void onStart() {

        publishBinderService(TAG, new BinderService());

        publishBinderService(TAG, new BinderService());

        // Logs dock state after setDockStateFromProviderLocked sets mReportedDockState

        FrameworkStatsLog.write(FrameworkStatsLog.DOCK_STATE_CHANGED, mReportedDockState);

    }

    }





    @Override

    @Override
@@ -255,7 +258,6 @@ final class DockObserver extends SystemService { 
                    + mReportedDockState);

                    + mReportedDockState);

            final int previousDockState = mPreviousDockState;

            final int previousDockState = mPreviousDockState;

            mPreviousDockState = mReportedDockState;

            mPreviousDockState = mReportedDockState;



            // Skip the dock intent if not yet provisioned.

            // Skip the dock intent if not yet provisioned.

            final ContentResolver cr = getContext().getContentResolver();

            final ContentResolver cr = getContext().getContentResolver();

            if (!mDeviceProvisionedObserver.isDeviceProvisioned()) {

            if (!mDeviceProvisionedObserver.isDeviceProvisioned()) {