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

Commit ba0b9857 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "BluetoothManagerService print ms in dumpsys" am: 38f79a8a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2439773



Change-Id: Ic61e3714b25e587c53ddec5f32444e738d9bece4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8318c10 38f79a8a

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ import java.io.FileDescriptor; 
import java.io.FileOutputStream;

import java.io.PrintWriter;

import java.time.Duration;

import java.time.Instant;

import java.time.ZoneId;

import java.time.format.DateTimeFormatter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedList;
@@ -242,8 +245,9 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
    private boolean mEnable;

    private boolean mShutdownInProgress = false;



    private static CharSequence timeToLog(long timestamp) {

        return android.text.format.DateFormat.format("MM-dd HH:mm:ss", timestamp);

    private static String timeToLog(long timestamp) {

        return DateTimeFormatter.ofPattern("MM-dd HH:mm:ss.SSS").withZone(ZoneId.systemDefault())

            .format(Instant.ofEpochMilli(timestamp));

    }



    /**