Rearrange PAN and PBAP statements to make AOSP and MASTER consistent
Change-Id: I1dec9ba61d92379546fed8a3b00ec6b5a8bca69e
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
index 19ac424..bcc5e38 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
@@ -31,9 +31,9 @@
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothHeadsetClient;
import android.bluetooth.BluetoothInputDevice;
-import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothPbapClient;
import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothUuid;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -68,8 +68,8 @@
private final IntentFilter mHidStateChangeFilter;
private final IntentFilter mHspStateChangeFilter;
private final IntentFilter mHfpClientStateChangeFilter;
- private final IntentFilter mPanStateChangeFilter;
private final IntentFilter mPbapClientStateChangeFilter;
+ private final IntentFilter mPanStateChangeFilter;
private final Bundle mGoodNews;
private final Bundle mBadNews;
@@ -79,8 +79,8 @@
private BluetoothHidFacade mHidProfile;
private BluetoothHspFacade mHspProfile;
private BluetoothHfpClientFacade mHfpClientProfile;
- private BluetoothPanFacade mPanProfile;
private BluetoothPbapClientFacade mPbapClientProfile;
+ private BluetoothPanFacade mPanProfile;
public BluetoothConnectionFacade(FacadeManager manager) {
super(manager);
@@ -99,8 +99,8 @@
mHidProfile = manager.getReceiver(BluetoothHidFacade.class);
mHspProfile = manager.getReceiver(BluetoothHspFacade.class);
mHfpClientProfile = manager.getReceiver(BluetoothHfpClientFacade.class);
- mPanProfile = manager.getReceiver(BluetoothPanFacade.class);
mPbapClientProfile = manager.getReceiver(BluetoothPbapClientFacade.class);
+ mPanProfile = manager.getReceiver(BluetoothPanFacade.class);
mDiscoverConnectFilter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
mDiscoverConnectFilter.addAction(BluetoothDevice.ACTION_UUID);
@@ -122,10 +122,10 @@
mHspStateChangeFilter = new IntentFilter(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
mHfpClientStateChangeFilter =
new IntentFilter(BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED);
- mPanStateChangeFilter =
- new IntentFilter(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
mPbapClientStateChangeFilter =
new IntentFilter(BluetoothPbapClient.ACTION_CONNECTION_STATE_CHANGED);
+ mPanStateChangeFilter =
+ new IntentFilter(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
mGoodNews = new Bundle();
mGoodNews.putBoolean("Status", true);
@@ -437,8 +437,8 @@
mHidProfile.hidDisconnect(device);
mHspProfile.hspDisconnect(device);
mHfpClientProfile.hfpClientDisconnect(device);
- mPanProfile.panDisconnect(device);
mPbapClientProfile.pbapClientDisconnect(device);
+ mPanProfile.panDisconnect(device);
}
@Rpc(description = "Start intercepting all bluetooth connection pop-ups.")
diff --git a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
index b1f4f8f..866ab6b 100644
--- a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
@@ -36,12 +36,11 @@
import com.googlecode.android_scripting.facade.bluetooth.BluetoothHfpClientFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothHidFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothHspFacade;
-import com.googlecode.android_scripting.facade.bluetooth.BluetoothHfpClientFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothLeAdvertiseFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothLeScanFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothMapFacade;
-import com.googlecode.android_scripting.facade.bluetooth.BluetoothPanFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothPbapClientFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothPanFacade;
import com.googlecode.android_scripting.facade.bluetooth.BluetoothRfcommFacade;
import com.googlecode.android_scripting.facade.bluetooth.GattClientFacade;
import com.googlecode.android_scripting.facade.bluetooth.GattServerFacade;
@@ -145,10 +144,10 @@
if (sSdkLevel >= 23) {
// add new facades here
sFacadeClassList.add(WifiNanManagerFacade.class);
- sFacadeClassList.add(NsdManagerFacade.class);
sFacadeClassList.add(BluetoothHfpClientFacade.class);
sFacadeClassList.add(BluetoothA2dpSinkFacade.class);
sFacadeClassList.add(BluetoothPbapClientFacade.class);
+ sFacadeClassList.add(NsdManagerFacade.class);
}
for (Class<? extends RpcReceiver> recieverClass : sFacadeClassList) {