diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2017-02-28 19:14:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-28 19:14:58 +0000 |
| commit | 61a6327f528f34e239db81ed545a7b26f2b5ac4d (patch) | |
| tree | cea2dd845278e3e707ea82b7b841b9ca813b82b3 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 13d4d0690ed7f4ee600ac5a6039a3c8c83e1e76d (diff) | |
| parent | 019168f8b60cb46f5592ea5fbea3b227bd2de8eb (diff) | |
Merge "Bluetooth: fix enable log: display 24h time"
am: 019168f8b6
Change-Id: Ic9ba7b27e9ad997a6f8ba0ae6e4794903ef7806a
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
| -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 a5290deb8e..a1f9a9b451 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; } |