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

Commit de765c22 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: f85e47bb

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



Change-Id: I25d4bd87afc3636778ac22a0ecbaa255e4e109f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28f350e3 f85e47bb

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -37,6 +37,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;
@@ -195,6 +196,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
@@ -256,7 +259,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()) {