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

Commit 1e74c190 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "OPP: Standardize date in dump()" 

am: 12cbaebe

Change-Id: Idf95899d24d204f9c9dd5a49ed2519ed8fe16b25
parents 42c0ec42 12cbaebe

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+4 −4
Original line number Diff line number Diff line
@@ -255,10 +255,10 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
            println(sb, "Shares:");

            for (BluetoothOppShareInfo info : mShares) {

                String dir = info.mDirection == BluetoothShare.DIRECTION_OUTBOUND ? " -> " : " <- ";

                SimpleDateFormat format = new SimpleDateFormat("MM'.'dd'@'HH':'mm':'ss", Locale.US);

                SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm:ss", Locale.US);

                Date date = new Date(info.mTimestamp);

                println(sb, "  " + format.format(date) + ": " + dir + " " + info.mCurrentBytes + "/"

                        + info.mTotalBytes + "B ");

                println(sb, "  " + format.format(date) + dir + info.mCurrentBytes + "/"

                        + info.mTotalBytes);

            }

        }

    }