Properly reset CDM

Bug: 149850454
Test: Switch users and verify CDM state
Change-Id: Id63be182484c0ee54fb1c9278986a025553352a0

3 files changed, 11 insertions, 14 deletions

diff --git a/connected-device-lib/src/com/android/car/connecteddevice/ConnectedDeviceManager.java b/connected-device-lib/src/com/android/car/connecteddevice/ConnectedDeviceManager.java
index addaf3b2..ba49b3b8 100644
--- a/connected-device-lib/src/com/android/car/connecteddevice/ConnectedDeviceManager.java
+++ b/connected-device-lib/src/com/android/car/connecteddevice/ConnectedDeviceManager.java
@@ -187,22 +187,20 @@ public class ConnectedDeviceManager {
     public void start() {
         logd(TAG, "Starting ConnectedDeviceManager.");
         EventLog.onConnectedDeviceManagerStarted();
-        //mCentralManager.start();
+        // TODO (b/141312136) Start central manager
         mPeripheralManager.start();
         connectToActiveUserDevice();
     }
 
-    /** Clean up internal processes and disconnect any active connections. */
-    public void cleanup() {
-        logd(TAG, "Cleaning up ConnectedDeviceManager.");
-        mIsConnectingToUserDevice.set(false);
-        mCentralManager.stop();
+    /** Reset internal processes and disconnect any active connections. */
+    public void reset() {
+        logd(TAG, "Resetting ConnectedDeviceManager.");
+        for (InternalConnectedDevice device : mConnectedDevices.values()) {
+            removeConnectedDevice(device.mConnectedDevice.getDeviceId(), device.mCarBleManager);
+        }
         mPeripheralManager.stop();
-        mDeviceCallbacks.clear();
-        mDeviceAssociationCallbacks.clear();
-        mActiveUserConnectionCallbacks.clear();
-        mAllUserConnectionCallbacks.clear();
-        mStorage.clearAssociationDeviceCallback();
+        // TODO (b/141312136) Stop central manager
+        mIsConnectingToUserDevice.set(false);
     }
 
     /** Returns {@link List<ConnectedDevice>} of devices currently connected. */
diff --git a/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBleManager.java b/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBleManager.java
index a00ff185..0b059064 100644
--- a/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBleManager.java
+++ b/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBleManager.java
@@ -64,7 +64,6 @@ public abstract class CarBleManager {
             }
         }
         mConnectedDevices.clear();
-        mCallbacks.clear();
     }
 
     /**
diff --git a/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBlePeripheralManager.java b/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBlePeripheralManager.java
index 3a4ebccb..5dec98d1 100644
--- a/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBlePeripheralManager.java
+++ b/connected-device-lib/src/com/android/car/connecteddevice/ble/CarBlePeripheralManager.java
@@ -494,8 +494,8 @@ public class CarBlePeripheralManager extends CarBleManager {
                     }
 
                     logd(TAG, "Received new message from " + connectedDevice.mDeviceId
-                            + " with " + deviceMessage.getMessage().length + " in its payload. "
-                            + "Notifying " + mCallbacks.size() + " callbacks.");
+                            + " with " + deviceMessage.getMessage().length + " bytes in its "
+                            + "payload. Notifying " + mCallbacks.size() + " callbacks.");
                     mCallbacks.invoke(
                             callback ->callback.onMessageReceived(connectedDevice.mDeviceId,
                                     deviceMessage));