Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301 am: add7c533c6

am: 5c44929f79 Change-Id: If69f2d82f61784b79e6f64d335c70c98b89f6542
2017-02-28 19:33:42 +00:00
parent 894b5b9998 5c44929f79
commit 184465db14
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -167,7 +167,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
        }

        public String toString() {
-            return android.text.format.DateFormat.format("MM-dd hh:mm:ss ", mTimestamp) +
+            return android.text.format.DateFormat.format("MM-dd HH:mm:ss ", mTimestamp) +
                    (mEnable ? "  Enabled " : " Disabled ") + " by " + mPackageName;
        }