diff options
author | Marie Janssen <jamuraa@google.com> | 2016-12-28 14:10:21 -0800 |
---|---|---|
committer | Marie Janssen <jamuraa@google.com> | 2016-12-29 11:45:31 -0800 |
commit | 2d1d81f23366fd0adaa295342f86a42e46c3f2ce (patch) | |
tree | c0e402dbdd585950d21905bb463a6554b68e6f85 | |
parent | c29e2f172c2a5fda1f0840aa6fc140a8209140af (diff) | |
download | android_packages_apps_Bluetooth-2d1d81f23366fd0adaa295342f86a42e46c3f2ce.tar.gz android_packages_apps_Bluetooth-2d1d81f23366fd0adaa295342f86a42e46c3f2ce.tar.bz2 android_packages_apps_Bluetooth-2d1d81f23366fd0adaa295342f86a42e46c3f2ce.zip |
Move state dumpsys (to BluetoothManagerService)
BluetoothManagerService will dump basic state about Bluetooth now for
standard dumpsys arguments. Move it from here and track which apps enable /
disable Bluetooth.
Test: enable/disable a few times, check that apps are recorded correctly
Bug: 33692282
Change-Id: I7505ba25a5cafda061fa23774cc31a6b83909d34
(cherry picked from commit 4f768f68b35a237052bbbb8570ff1896828c1e05)
-rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 544b23c4c..14901c6e3 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2417,28 +2417,6 @@ public class AdapterService extends Service { return getResources().getInteger(R.integer.config_bluetooth_operating_voltage_mv) / 1000.0; } - private String getStateString() { - int state = getState(); - switch (state) { - case BluetoothAdapter.STATE_OFF: - return "STATE_OFF"; - case BluetoothAdapter.STATE_TURNING_ON: - return "STATE_TURNING_ON"; - case BluetoothAdapter.STATE_ON: - return "STATE_ON"; - case BluetoothAdapter.STATE_TURNING_OFF: - return "STATE_TURNING_OFF"; - case BluetoothAdapter.STATE_BLE_TURNING_ON: - return "STATE_BLE_TURNING_ON"; - case BluetoothAdapter.STATE_BLE_ON: - return "STATE_BLE_ON"; - case BluetoothAdapter.STATE_BLE_TURNING_OFF: - return "STATE_BLE_TURNING_OFF"; - default: - return "UNKNOWN STATE: " + state; - } - } - @Override protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) { enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); @@ -2456,20 +2434,6 @@ public class AdapterService extends Service { } } - long onDuration = System.currentTimeMillis() - mBluetoothStartTime; - String onDurationString = String.format("%02d:%02d:%02d.%03d", - (int)(onDuration / (1000 * 60 * 60)), - (int)((onDuration / (1000 * 60)) % 60), - (int)((onDuration / 1000) % 60), - (int)(onDuration % 1000)); - - writer.println("Bluetooth Status"); - writer.println(" enabled: " + isEnabled()); - writer.println(" state: " + getStateString()); - writer.println(" address: " + getAddress()); - writer.println(" name: " + getName()); - writer.println(" time since enabled: " + onDurationString + "\n"); - writer.println("Bonded devices:"); for (BluetoothDevice device : getBondedDevices()) { writer.println(" " + device.getAddress() + |