diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2017-02-28 19:33:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-28 19:33:42 +0000 |
| commit | 30769d8935ba589bf705bf6c61fda8b12be87b1c (patch) | |
| tree | efd986b567893a23b9b34fb12252be38aa4e007c | |
| parent | 4f6e75927a7bef0897a779c0d87d65b2903d4d39 (diff) | |
| parent | 61a6327f528f34e239db81ed545a7b26f2b5ac4d (diff) | |
Merge "Bluetooth: fix enable log: display 24h time" am: 019168f8b6 am: 61a6327f52
am: 5c44929f79
Change-Id: If69f2d82f61784b79e6f64d335c70c98b89f6542
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index f31555327b..e8df38bb96 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/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; } |