summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-09-21 22:57:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-21 22:57:24 +0000
commit2b8f0acc2ceb2c027201bfe981546018a3ffd20b (patch)
tree2a2c2f041c8464c78c64f75b32e8d76819a12853
parent6bdeca6be2e4d41a7c397cf6859de8d8a17098c2 (diff)
parentf4386904ebbcb1af27828617ba287c512b7223ec (diff)
downloadandroid_packages_apps_Bluetooth-2b8f0acc2ceb2c027201bfe981546018a3ffd20b.tar.gz
android_packages_apps_Bluetooth-2b8f0acc2ceb2c027201bfe981546018a3ffd20b.tar.bz2
android_packages_apps_Bluetooth-2b8f0acc2ceb2c027201bfe981546018a3ffd20b.zip
Merge "Collect number of paired BT devices." into nyc-mr1-dev
-rw-r--r--src/com/android/bluetooth/btservice/AdapterService.java1
-rw-r--r--src/com/android/bluetooth/btservice/bluetooth.proto3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 261c8f90f..9e9310aa2 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -2481,6 +2481,7 @@ public class AdapterService extends Service {
private void dumpJava(FileDescriptor fd) {
BluetoothProto.BluetoothLog log = new BluetoothProto.BluetoothLog();
+ log.setNumBondedDevices(getBondedDevices().length);
for (ProfileService profile : mProfiles) {
profile.dumpProto(log);
diff --git a/src/com/android/bluetooth/btservice/bluetooth.proto b/src/com/android/bluetooth/btservice/bluetooth.proto
index 11311ea58..77ded7807 100644
--- a/src/com/android/bluetooth/btservice/bluetooth.proto
+++ b/src/com/android/bluetooth/btservice/bluetooth.proto
@@ -25,6 +25,9 @@ message BluetoothLog {
// Scan event information.
repeated ScanEvent scan_event = 4;
+
+ // Number of bonded devices.
+ optional int32 num_bonded_devices = 5;
}
// The information about the device.