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

Commit 9fda792d authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

Merge "Add IntDef annotations from BluetoothPan.java to PanService.java" am: 3de810ff 

am: dbc8c550

Change-Id: I489395cf77acae1c480f5e8b916a70485e0fdb29
parents cba6577f dbc8c550

android/app/src/com/android/bluetooth/pan/PanService.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.bluetooth.pan; 




import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothPan;

import android.bluetooth.BluetoothPan;

import android.bluetooth.BluetoothPan.LocalPanRole;

import android.bluetooth.BluetoothPan.RemotePanRole;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.IBluetoothPan;

import android.bluetooth.IBluetoothPan;

import android.content.Context;

import android.content.Context;
@@ -485,8 +487,8 @@ public class PanService extends ProfileService { 
        }

        }

    }

    }





    void handlePanDeviceStateChange(BluetoothDevice device, String iface, int state, int localRole,

    void handlePanDeviceStateChange(BluetoothDevice device, String iface, int state,

            int remoteRole) {

            @LocalPanRole int localRole, @RemotePanRole int remoteRole) {

        if (DBG) {

        if (DBG) {

            Log.d(TAG, "handlePanDeviceStateChange: device: " + device + ", iface: " + iface

            Log.d(TAG, "handlePanDeviceStateChange: device: " + device + ", iface: " + iface

                    + ", state: " + state + ", localRole:" + localRole + ", remoteRole:"

                    + ", state: " + state + ", localRole:" + localRole + ", remoteRole:"