Rename AdbLibSession to AdbSession

Test: existing
Bug: N/A
Change-Id: Id5b39cf5ad3cd987f7a81c22af48281927f3c822

6 files changed, 24 insertions, 24 deletions

diff --git a/logcat/src/com/android/tools/idea/logcat/LogcatHeaderPanel.kt b/logcat/src/com/android/tools/idea/logcat/LogcatHeaderPanel.kt
index 77955c9b22e..54224cbc4e4 100644
--- a/logcat/src/com/android/tools/idea/logcat/LogcatHeaderPanel.kt
+++ b/logcat/src/com/android/tools/idea/logcat/LogcatHeaderPanel.kt
@@ -15,7 +15,7 @@
  */
 package com.android.tools.idea.logcat
 
-import com.android.adblib.AdbLibSession
+import com.android.adblib.AdbSession
 import com.android.tools.idea.logcat.devices.Device
 import com.android.tools.idea.logcat.devices.DeviceComboBox
 import com.android.tools.idea.logcat.devices.DeviceComboBoxDeviceTracker
@@ -48,7 +48,7 @@ internal class LogcatHeaderPanel(
   packageNamesProvider: PackageNamesProvider,
   filter: String,
   initialDevice: Device?,
-  adbSession: AdbLibSession,
+  adbSession: AdbSession,
 ) : JPanel() {
   private val deviceComboBox = DeviceComboBox(
     logcatPresenter,
diff --git a/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt b/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
index ffec8fe5d95..66535cbb8c1 100644
--- a/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
+++ b/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
@@ -15,7 +15,7 @@
  */
 package com.android.tools.idea.logcat
 
-import com.android.adblib.AdbLibSession
+import com.android.adblib.AdbSession
 import com.android.annotations.concurrency.UiThread
 import com.android.tools.adtui.toolwindow.splittingtabs.state.SplittingTabsStateProvider
 import com.android.tools.idea.adb.processnamemonitor.ProcessNameMonitor
@@ -170,7 +170,7 @@ internal class LogcatMainPanel(
   hyperlinkDetector: HyperlinkDetector? = null,
   foldingDetector: FoldingDetector? = null,
   packageNamesProvider: PackageNamesProvider = ProjectPackageNamesProvider(project),
-  adbSession: AdbLibSession = AdbLibService.getInstance(project).session,
+  adbSession: AdbSession = AdbLibService.getInstance(project).session,
   private val logcatService: LogcatService =
     LogcatServiceImpl(project, { AdbLibService.getInstance(project).session.deviceServices }, ProcessNameMonitor.getInstance(project)),
   zoneId: ZoneId = ZoneId.systemDefault()
diff --git a/logcat/src/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTracker.kt b/logcat/src/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTracker.kt
index 1289ef49a76..6510169f428 100644
--- a/logcat/src/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTracker.kt
+++ b/logcat/src/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTracker.kt
@@ -15,7 +15,7 @@
  */
 package com.android.tools.idea.logcat.devices
 
-import com.android.adblib.AdbLibSession
+import com.android.adblib.AdbSession
 import com.android.adblib.DeviceInfo
 import com.android.adblib.DevicePropertyNames.RO_BOOT_QEMU_AVD_NAME
 import com.android.adblib.DevicePropertyNames.RO_BUILD_VERSION_RELEASE
@@ -48,12 +48,12 @@ import kotlin.coroutines.CoroutineContext
 private val ADB_TIMEOUT = Duration.ofMillis(1000)
 
 /**
- * An implementation of IDeviceComboBoxDeviceTracker that uses an [AdbLibSession]
+ * An implementation of IDeviceComboBoxDeviceTracker that uses an [AdbSession]
  */
 internal class DeviceComboBoxDeviceTracker(
   project: Project,
   private val preexistingDevice: Device?,
-  private val adbSession: AdbLibSession = AdbLibService.getSession(project),
+  private val adbSession: AdbSession = AdbLibService.getSession(project),
   private val coroutineContext: CoroutineContext = Dispatchers.IO,
 ) : IDeviceComboBoxDeviceTracker {
 
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
index 63293bf399c..2a68f6372a0 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
@@ -15,9 +15,9 @@
  */
 package com.android.tools.idea.logcat
 
-import com.android.adblib.AdbLibSession
+import com.android.adblib.AdbSession
 import com.android.adblib.DeviceState
-import com.android.adblib.testing.FakeAdbLibSession
+import com.android.adblib.testing.FakeAdbSession
 import com.android.testutils.MockitoKt.eq
 import com.android.testutils.MockitoKt.mock
 import com.android.tools.adtui.TreeWalker
@@ -124,7 +124,7 @@ class LogcatMainPanelTest {
 
   private val mockHyperlinkDetector = mock<HyperlinkDetector>()
   private val mockFoldingDetector = mock<FoldingDetector>()
-  private val fakeAdbLibSession = FakeAdbLibSession()
+  private val fakeAdbSession = FakeAdbSession()
   private val androidLogcatFormattingOptions = AndroidLogcatFormattingOptions()
 
   @Before
@@ -358,10 +358,10 @@ class LogcatMainPanelTest {
   @Test
   fun clearMessageView_bySubscriptionToClearLogcatListener() {
     val testDevice = TestDevice("device1", DeviceState.ONLINE, 11, 30, "Google", "Pixel", "")
-    fakeAdbLibSession.deviceServices.setupCommandsForDevice(testDevice)
-    fakeAdbLibSession.hostServices.setDevices(testDevice)
+    fakeAdbSession.deviceServices.setupCommandsForDevice(testDevice)
+    fakeAdbSession.hostServices.setDevices(testDevice)
     val logcatMainPanel = runInEdtAndGet {
-      logcatMainPanel(adbSession = fakeAdbLibSession).also {
+      logcatMainPanel(adbSession = fakeAdbSession).also {
         waitForCondition(TIMEOUT_SEC, SECONDS) { it.getConnectedDevice() != null }
         it.editor.document.setText("not-empty")
       }
@@ -378,12 +378,12 @@ class LogcatMainPanelTest {
   fun clearMessageView_bySubscriptionToClearLogcatListener_otherDevice() {
     val testDevice1 = TestDevice("device1", DeviceState.ONLINE, 11, 30, "Google", "Pixel", "")
     val testDevice2 = TestDevice("device2", DeviceState.ONLINE, 11, 30, "Google", "Pixel", "")
-    fakeAdbLibSession.deviceServices.setupCommandsForDevice(testDevice1)
-    fakeAdbLibSession.deviceServices.setupCommandsForDevice(testDevice2)
-    fakeAdbLibSession.hostServices.setDevices(testDevice1, testDevice2)
+    fakeAdbSession.deviceServices.setupCommandsForDevice(testDevice1)
+    fakeAdbSession.deviceServices.setupCommandsForDevice(testDevice2)
+    fakeAdbSession.hostServices.setDevices(testDevice1, testDevice2)
 
     val logcatMainPanel = runInEdtAndGet {
-      logcatMainPanel(adbSession = fakeAdbLibSession).also {
+      logcatMainPanel(adbSession = fakeAdbSession).also {
         waitForCondition(TIMEOUT_SEC, SECONDS) { it.getConnectedDevice() != null }
         it.editor.document.setText("not-empty")
       }
@@ -957,7 +957,7 @@ class LogcatMainPanelTest {
     hyperlinkDetector: HyperlinkDetector? = null,
     foldingDetector: FoldingDetector? = null,
     packageNamesProvider: PackageNamesProvider = FakePackageNamesProvider(),
-    adbSession: AdbLibSession = FakeAdbLibSession(),
+    adbSession: AdbSession = FakeAdbSession(),
     zoneId: ZoneId = ZoneId.of("Asia/Yerevan"),
   ) =
     LogcatMainPanel(
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTrackerTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTrackerTest.kt
index 4ba145ca90b..b8650c20382 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTrackerTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/devices/DeviceComboBoxDeviceTrackerTest.kt
@@ -15,11 +15,11 @@
  */
 package com.android.tools.idea.logcat.devices
 
-import com.android.adblib.AdbLibSession
+import com.android.adblib.AdbSession
 import com.android.adblib.DeviceState.AUTHORIZING
 import com.android.adblib.DeviceState.OFFLINE
 import com.android.adblib.DeviceState.ONLINE
-import com.android.adblib.testing.FakeAdbLibSession
+import com.android.adblib.testing.FakeAdbSession
 import com.android.tools.idea.logcat.devices.DeviceEvent.Added
 import com.android.tools.idea.logcat.devices.DeviceEvent.StateChanged
 import com.android.tools.idea.logcat.devices.DeviceEvent.TrackingReset
@@ -47,7 +47,7 @@ class DeviceComboBoxDeviceTrackerTest {
   @get:Rule
   val projectRule = ProjectRule()
 
-  private val adbSession = FakeAdbLibSession()
+  private val adbSession = FakeAdbSession()
   private val hostServices = adbSession.hostServices
   private val deviceServices = adbSession.deviceServices
 
@@ -309,7 +309,7 @@ class DeviceComboBoxDeviceTrackerTest {
 
   private fun deviceComboBoxDeviceTracker(
     preexistingDevice: Device? = null,
-    adbSession: AdbLibSession = this@DeviceComboBoxDeviceTrackerTest.adbSession,
+    adbSession: AdbSession = this@DeviceComboBoxDeviceTrackerTest.adbSession,
   ) = DeviceComboBoxDeviceTracker(projectRule.project, preexistingDevice, adbSession, EmptyCoroutineContext)
 }
 
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/service/LogcatServiceImplTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/service/LogcatServiceImplTest.kt
index 54ac9a36bf8..155670e6141 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/service/LogcatServiceImplTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/service/LogcatServiceImplTest.kt
@@ -18,7 +18,7 @@ package com.android.tools.idea.logcat.service
 import com.android.adblib.AdbDeviceServices
 import com.android.adblib.DeviceSelector
 import com.android.adblib.testing.FakeAdbDeviceServices.ShellRequest
-import com.android.adblib.testing.FakeAdbLibSession
+import com.android.adblib.testing.FakeAdbSession
 import com.android.testutils.TestResources
 import com.android.tools.idea.adb.processnamemonitor.ProcessNameMonitor
 import com.android.tools.idea.adb.processnamemonitor.testing.FakeProcessNameMonitor
@@ -54,7 +54,7 @@ class LogcatServiceImplTest {
   private val device30 = Device.createPhysical("device", isOnline = true, release = 10, sdk = 30, manufacturer = "Google", model = "Pixel")
   private val device23 = Device.createPhysical("device", isOnline = true, release = 7, sdk = 23, manufacturer = "Google", model = "Pixel")
 
-  private val fakeDeviceServices = FakeAdbLibSession().deviceServices
+  private val fakeDeviceServices = FakeAdbSession().deviceServices
   private val fakeProcessNameMonitor = FakeProcessNameMonitor()
 
   @Before