Merge "Require bonding and encryption for PBAP server"

1 files changed, 1 insertions, 7 deletions

diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index a7225b260..536c7ae13 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -333,13 +333,7 @@ public class BluetoothPbapService extends Service {
             try {
                 // It is mandatory for PSE to support initiation of bonding and
                 // encryption.
-                // InsecureRfcomm => encryption is on, authentication of link
-                // key is off. For legacy pairing it doesn't matter, for 2.1
-                // pairing - if we have already done MITM protection, then
-                // the same linkeys will be used. If not, then all core profiles
-                // will have the same level of protection. This API has to be
-                // renamed - its no as insecure as the name suggests.
-                mServerSocket = mAdapter.listenUsingInsecureRfcommOn(PORT_NUM);
+                mServerSocket = mAdapter.listenUsingEncryptedRfcommOn(PORT_NUM);
             } catch (IOException e) {
                 Log.e(TAG, "Error create RfcommServerSocket " + e.toString());
                 initSocketOK = false;