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

Commit 67d068b5 authored by Christine Hallstrom's avatar Christine Hallstrom Committed by android-build-merger
Browse files

Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev 

am: 7fb263c4

* commit '7fb263c4':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
parents a30685ef 7fb263c4

core/java/android/bluetooth/BluetoothDevice.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.os.ParcelUuid;

import android.os.ParcelUuid;

import android.os.Process;

import android.os.RemoteException;

import android.os.RemoteException;

import android.util.Log;

import android.util.Log;
@@ -823,6 +824,9 @@ public final class BluetoothDevice implements Parcelable { 
            return false;

            return false;

        }

        }

        try {

        try {

            Log.i(TAG, "createBond() for device " + getAddress() +

                    " called by pid: " + Process.myPid() +

                    " tid: " + Process.myTid());

            return sService.createBond(this, TRANSPORT_AUTO);

            return sService.createBond(this, TRANSPORT_AUTO);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;

        return false;
@@ -854,6 +858,9 @@ public final class BluetoothDevice implements Parcelable { 
            throw new IllegalArgumentException(transport + " is not a valid Bluetooth transport");

            throw new IllegalArgumentException(transport + " is not a valid Bluetooth transport");

        }

        }

        try {

        try {

            Log.i(TAG, "createBond() for device " + getAddress() +

                    " called by pid: " + Process.myPid() +

                    " tid: " + Process.myTid());

            return sService.createBond(this, transport);

            return sService.createBond(this, transport);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;

        return false;
@@ -922,6 +929,9 @@ public final class BluetoothDevice implements Parcelable { 
            return false;

            return false;

        }

        }

        try {

        try {

            Log.i(TAG, "cancelBondProcess() for device " + getAddress() +

                    " called by pid: " + Process.myPid() +

                    " tid: " + Process.myTid());

            return sService.cancelBondProcess(this);

            return sService.cancelBondProcess(this);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;

        return false;
@@ -943,6 +953,9 @@ public final class BluetoothDevice implements Parcelable { 
            return false;

            return false;

        }

        }

        try {

        try {

            Log.i(TAG, "removeBond() for device " + getAddress() +

                    " called by pid: " + Process.myPid() +

                    " tid: " + Process.myTid());

            return sService.removeBond(this);

            return sService.removeBond(this);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;

        return false;