commit 7ac05916e9f99c527ed28dbc029b2e6aa132e861
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 13 21:41:33 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 13 21:41:33 2017 +0000
tree 6995a9f2f60d4676323977bb140c32c2befa3495
parent 7bb54e6c815f3bcbab84d47331af522b0d74b3ca
parent 873086e4994b83ee35622e2f6d3a1f08a955cc63

Merge "MAP: Update API name used during Socket Listening."

src/com/android/bluetooth/map/BluetoothMapMasInstance.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapMasInstance.java b/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
index cf3af13..2ab4dea 100644
--- a/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
+++ b/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
@@ -257,9 +257,12 @@
         return combinedVersionCounter;
     }
 
-    public synchronized void startRfcommSocketListener() {
+    /**
+     * Start Obex Server Sockets and create the SDP record.
+     */
+    public synchronized void startSocketListeners() {
         if (D) {
-            Log.d(mTag, "Map Service startRfcommSocketListener");
+            Log.d(mTag, "Map Service startSocketListeners");
         }
 
         if (mServerSession != null) {
@@ -422,7 +425,7 @@
         if (D) {
             Log.d(mTag, "MAP Service restartObexServerSession()");
         }
-        startRfcommSocketListener();
+        startSocketListeners();
     }
 
 
@@ -490,7 +493,7 @@
             Log.e(mTag, "Failed to accept incomming connection - " + "shutdown");
         } else {
             Log.e(mTag, "Failed to accept incomming connection - " + "restarting");
-            startRfcommSocketListener();
+            startSocketListeners();
         }
     }
 

src/com/android/bluetooth/map/BluetoothMapService.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index f0a7208..4875b37 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -214,20 +214,20 @@
     }
 
     /**
-     * Starts the RFComm listener threads for each MAS
+     * Starts the Socket listener threads for each MAS
      * @throws IOException
      */
-    private void startRfcommSocketListeners(int masId) {
+    private void startSocketListeners(int masId) {
         if (masId == -1) {
             for (int i = 0, c = mMasInstances.size(); i < c; i++) {
-                mMasInstances.valueAt(i).startRfcommSocketListener();
+                mMasInstances.valueAt(i).startSocketListeners();
             }
         } else {
             BluetoothMapMasInstance masInst = mMasInstances.get(masId); // returns null for -1
             if (masInst != null) {
-                masInst.startRfcommSocketListener();
+                masInst.startSocketListeners();
             } else {
-                Log.w(TAG, "startRfcommSocketListeners(): Invalid MasId: " + masId);
+                Log.w(TAG, "startSocketListeners(): Invalid MasId: " + masId);
             }
         }
     }
@@ -363,7 +363,7 @@
                     break;
                 case START_LISTENER:
                     if (mAdapter.isEnabled()) {
-                        startRfcommSocketListeners(msg.arg1);
+                        startSocketListeners(msg.arg1);
                     }
                     break;
                 case MSG_MAS_CONNECT:
@@ -754,7 +754,7 @@
                     changed = true;
                     /* Start the new instance */
                     if (mAdapter.isEnabled()) {
-                        newInst.startRfcommSocketListener();
+                        newInst.startSocketListeners();
                     }
                 }
             }