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

Commit 0864fde6 authored by Sharvil Nanavati's avatar Sharvil Nanavati Committed by Android Git Automerger
Browse files

am 57927d9b: am 8a0fd130: Merge "resolved conflicts for merge of 8f68b0f6 to mnc-dev" into mnc-dev 

* commit '57927d9b1ceee2be37df33c8ef933b90e6af61a8':
  Dump bonded Bluetooth devices in dumpsys.
parents 2583787f 97438f1c

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server; 
import android.Manifest;

import android.app.ActivityManager;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.IBluetooth;

import android.bluetooth.IBluetoothCallback;
@@ -114,6 +115,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int SERVICE_IBLUETOOTH = 1;

    private static final int SERVICE_IBLUETOOTHGATT = 2;



    private static final String[] DEVICE_TYPE_NAMES = new String[] {

            "???",

            "BR/EDR",

            "LE",

            "DUAL"

        };



    private final Context mContext;

    private static int mBleAppCount = 0;
@@ -1801,6 +1809,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        } else {

            ParcelFileDescriptor pfd = null;

            try {

                writer.println("Bonded devices:");

                for (BluetoothDevice device : mBluetooth.getBondedDevices()) {

                    writer.println("  " + device.getAddress() +

                            " [" + DEVICE_TYPE_NAMES[device.getType()] + "] " +

                            device.getName());

                }

                writer.flush();



                pfd = ParcelFileDescriptor.dup(fd);

                mBluetooth.dump(pfd);

            } catch (RemoteException re) {