Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I25d4bd87afc3636778ac22a0ecbaa255e4e109f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-05-19 15:57:00 +00:00
parent 28f350e337 f85e47bb1a
commit de765c22d6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/DockObserver.java
View File

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