Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Use elapsed real time for calculating onDuration"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-15 17:06:41 +00:00
committed by Gerrit Code Review
parent dd5384a4fe 12a3501abf
commit 22b12e6b06
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -195,6 +195,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private LinkedList<ActiveLog> mActiveLogs; private LinkedList<ActiveLog> mActiveLogs;
private LinkedList<Long> mCrashTimestamps; private LinkedList<Long> mCrashTimestamps;
private int mCrashes; private int mCrashes;
private long mLastEnabledTime;
// configuration from external IBinder call which is used to // configuration from external IBinder call which is used to
// synchronize with broadcast receiver. // synchronize with broadcast receiver.
@@ -2021,6 +2022,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_ENABLE, mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_ENABLE,
quietMode ? 1 : 0, 0)); quietMode ? 1 : 0, 0));
addActiveLog(packageName, true); addActiveLog(packageName, true);
mLastEnabledTime = SystemClock.elapsedRealtime();
} }
private void addActiveLog(String packageName, boolean enable) { private void addActiveLog(String packageName, boolean enable) {
@@ -2142,7 +2144,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
writer.println(" address: " + mAddress); writer.println(" address: " + mAddress);
writer.println(" name: " + mName); writer.println(" name: " + mName);
if (mEnable) { if (mEnable) {
long onDuration = System.currentTimeMillis() - mActiveLogs.getLast().getTime(); long onDuration = SystemClock.elapsedRealtime() - mLastEnabledTime;
String onDurationString = String.format("%02d:%02d:%02d.%03d", String onDurationString = String.format("%02d:%02d:%02d.%03d",
(int)(onDuration / (1000 * 60 * 60)), (int)(onDuration / (1000 * 60 * 60)),
(int)((onDuration / (1000 * 60)) % 60), (int)((onDuration / (1000 * 60)) % 60),