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

Commit 2933dc63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[Avatar] Clear GattInstance in FactoryReset"

parents b0f55815 acf3b8dc

android/pandora/server/src/com/android/pandora/Gatt.kt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ class Gatt(private val context: Context) : GATTImplBase(), Closeable { 
  override fun close() {

    serverManager.server.close()

    mScope.cancel()

    // Clear existing Gatt instances to fix flakiness: b/279599889

    GattInstance.clearAllInstances()

  }



  override fun exchangeMTU(

android/pandora/server/src/com/android/pandora/GattInstance.kt

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ class GattInstance(val mDevice: BluetoothDevice, val mTransport: Int, val mConte 
      requireNotNull(instance) { "Unable to find GATT instance for $address" }

      return instance

    }

    fun clearAllInstances() {

        gattInstances.clear()

    }

  }



  private val mCallback =