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

Commit 82d9bdb1 authored by Nick Pelly's avatar Nick Pelly Committed by Android (Google) Code Review
Browse files

Merge "Don't enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread

parents 0ca9e88b 4fbc7412
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -329,7 +329,13 @@ public class BluetoothPbapService extends Service {
            try {
                // It is mandatory for PSE to support initiation of bonding and
                // encryption.
                mServerSocket = mAdapter.listenUsingRfcommOn(PORT_NUM);
                // 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);
            } catch (IOException e) {
                Log.e(TAG, "Error create RfcommServerSocket " + e.toString());
                initSocketOK = false;