Refactor some field names in kotlin classes
Bug: N/A
Test: TH
Change-Id: Ie121063393177f5704f4d1e347c766f5f04de70f
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
index 50e770b..7076084 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
@@ -24,13 +24,13 @@
import com.google.android.material.materialswitch.MaterialSwitch
class SettingsPortForwardingActiveAdapter(
- private val mPortsStateManager: PortsStateManager,
- private val mContext: Context,
+ private val portsStateManager: PortsStateManager,
+ private val context: Context,
) : SettingsPortForwardingBaseAdapter<SettingsPortForwardingActiveAdapter.ViewHolder>() {
override fun getItems(): ArrayList<SettingsPortForwardingItem> {
- val enabledPorts = mPortsStateManager.getEnabledPorts()
- return mPortsStateManager
+ val enabledPorts = portsStateManager.getEnabledPorts()
+ return portsStateManager
.getActivePorts()
.map { SettingsPortForwardingItem(it, enabledPorts.contains(it)) }
.toCollection(ArrayList())
@@ -50,18 +50,18 @@
}
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
- val port = mItems[position].port
+ val port = items[position].port
viewHolder.port.text =
- mContext.getString(
+ context.getString(
R.string.settings_port_forwarding_active_ports_content,
port,
- mPortsStateManager.getActivePortInfo(port)?.comm,
+ portsStateManager.getActivePortInfo(port)?.comm,
)
viewHolder.enabledSwitch.contentDescription = viewHolder.port.text
viewHolder.enabledSwitch.setOnCheckedChangeListener(null)
- viewHolder.enabledSwitch.isChecked = mItems[position].enabled
+ viewHolder.enabledSwitch.isChecked = items[position].enabled
viewHolder.enabledSwitch.setOnCheckedChangeListener { _, isChecked ->
- mPortsStateManager.updateEnabledPort(port, isChecked)
+ portsStateManager.updateEnabledPort(port, isChecked)
}
}
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
index dffe279..db3926d 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
@@ -31,30 +31,30 @@
private const val PORT_RANGE_MAX: Int = 65535
class SettingsPortForwardingActivity : AppCompatActivity() {
- private lateinit var mPortsStateManager: PortsStateManager
- private lateinit var mPortsStateListener: Listener
- private lateinit var mActivePortsAdapter: SettingsPortForwardingActiveAdapter
- private lateinit var mInactivePortsAdapter: SettingsPortForwardingInactiveAdapter
+ private lateinit var portsStateManager: PortsStateManager
+ private lateinit var portsStateListener: Listener
+ private lateinit var activePortsAdapter: SettingsPortForwardingActiveAdapter
+ private lateinit var inactivePortsAdapter: SettingsPortForwardingInactiveAdapter
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_port_forwarding)
- mPortsStateManager = PortsStateManager.getInstance(this)
+ portsStateManager = PortsStateManager.getInstance(this)
- mActivePortsAdapter = SettingsPortForwardingActiveAdapter(mPortsStateManager, this)
+ activePortsAdapter = SettingsPortForwardingActiveAdapter(portsStateManager, this)
val activeRecyclerView: RecyclerView =
findViewById(R.id.settings_port_forwarding_active_recycler_view)
activeRecyclerView.layoutManager = LinearLayoutManager(this)
- activeRecyclerView.adapter = mActivePortsAdapter
+ activeRecyclerView.adapter = activePortsAdapter
- mInactivePortsAdapter = SettingsPortForwardingInactiveAdapter(mPortsStateManager, this)
+ inactivePortsAdapter = SettingsPortForwardingInactiveAdapter(portsStateManager, this)
val inactiveRecyclerView: RecyclerView =
findViewById(R.id.settings_port_forwarding_inactive_recycler_view)
inactiveRecyclerView.layoutManager = LinearLayoutManager(this)
- inactiveRecyclerView.adapter = mInactivePortsAdapter
+ inactiveRecyclerView.adapter = inactivePortsAdapter
- mPortsStateListener = Listener()
+ portsStateListener = Listener()
val addButton = findViewById<ImageButton>(R.id.settings_port_forwarding_inactive_add_button)
addButton.setOnClickListener {
@@ -71,7 +71,7 @@
R.id.settings_port_forwarding_inactive_add_dialog_text
)!!
val port = editText.text.toString().toInt()
- mPortsStateManager.updateEnabledPort(port, true)
+ portsStateManager.updateEnabledPort(port, true)
}
.setNegativeButton(R.string.settings_port_forwarding_dialog_cancel, null)
.create()
@@ -121,8 +121,8 @@
)
positiveButton.setEnabled(false)
} else if (
- mPortsStateManager.getActivePorts().contains(port) ||
- mPortsStateManager.getEnabledPorts().contains(port)
+ portsStateManager.getActivePorts().contains(port) ||
+ portsStateManager.getEnabledPorts().contains(port)
) {
editText.setError(
getString(
@@ -141,19 +141,19 @@
private fun refreshAdapters() {
runOnUiThread {
- mActivePortsAdapter.refreshItems()
- mInactivePortsAdapter.refreshItems()
+ activePortsAdapter.refreshItems()
+ inactivePortsAdapter.refreshItems()
}
}
override fun onResume() {
super.onResume()
- mPortsStateManager.registerListener(mPortsStateListener)
+ portsStateManager.registerListener(portsStateListener)
refreshAdapters()
}
override fun onPause() {
- mPortsStateManager.unregisterListener(mPortsStateListener)
+ portsStateManager.unregisterListener(portsStateListener)
super.onPause()
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingBaseAdapter.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingBaseAdapter.kt
index 4595372..5b8d022 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingBaseAdapter.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingBaseAdapter.kt
@@ -21,10 +21,10 @@
abstract class SettingsPortForwardingBaseAdapter<T : RecyclerView.ViewHolder>() :
RecyclerView.Adapter<T>() {
- var mItems: SortedList<SettingsPortForwardingItem>
+ var items: SortedList<SettingsPortForwardingItem>
init {
- mItems =
+ items =
SortedList(
SettingsPortForwardingItem::class.java,
object : SortedListAdapterCallback<SettingsPortForwardingItem>(this) {
@@ -52,11 +52,11 @@
)
}
- override fun getItemCount() = mItems.size()
+ override fun getItemCount() = items.size()
abstract fun getItems(): ArrayList<SettingsPortForwardingItem>
fun refreshItems() {
- mItems.replaceAll(getItems())
+ items.replaceAll(getItems())
}
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingInactiveAdapter.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingInactiveAdapter.kt
index d572129..e1fe468 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingInactiveAdapter.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingInactiveAdapter.kt
@@ -24,14 +24,14 @@
import androidx.recyclerview.widget.RecyclerView
class SettingsPortForwardingInactiveAdapter(
- private val mPortsStateManager: PortsStateManager,
- private val mContext: Context,
+ private val portsStateManager: PortsStateManager,
+ private val context: Context,
) : SettingsPortForwardingBaseAdapter<SettingsPortForwardingInactiveAdapter.ViewHolder>() {
override fun getItems(): ArrayList<SettingsPortForwardingItem> {
- return mPortsStateManager
+ return portsStateManager
.getEnabledPorts()
- .subtract(mPortsStateManager.getActivePorts())
+ .subtract(portsStateManager.getActivePorts())
.map { SettingsPortForwardingItem(it, true) }
.toCollection(ArrayList())
}
@@ -50,15 +50,15 @@
}
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
- val port = mItems[position].port
+ val port = items[position].port
viewHolder.port.text = port.toString()
viewHolder.closeButton.contentDescription =
- mContext.getString(
+ context.getString(
R.string.settings_port_forwarding_other_enabled_port_close_button,
port,
)
viewHolder.closeButton.setOnClickListener { _ ->
- mPortsStateManager.updateEnabledPort(port, false)
+ portsStateManager.updateEnabledPort(port, false)
}
}
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/TerminalView.kt b/android/TerminalApp/java/com/android/virtualization/terminal/TerminalView.kt
index 18a39fa..0f990c5 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/TerminalView.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/TerminalView.kt
@@ -94,7 +94,7 @@
// AccessibilityDelegate to the parent view where the events are sent to. And to guarantee that
// the parent view exists, wait until the WebView is attached to the window by when the parent
// must exist.
- private val mA11yEventFilter: AccessibilityDelegate =
+ private val a11yEventFilter: AccessibilityDelegate =
object : AccessibilityDelegate() {
override fun onRequestSendAccessibilityEvent(
host: ViewGroup,
@@ -122,11 +122,11 @@
super.onAttachedToWindow()
if (a11yManager.isEnabled) {
val parent = getParent() as View
- parent.setAccessibilityDelegate(mA11yEventFilter)
+ parent.setAccessibilityDelegate(a11yEventFilter)
}
}
- private val mA11yNodeProvider: AccessibilityNodeProvider =
+ private val a11yNodeProvider: AccessibilityNodeProvider =
object : AccessibilityNodeProvider() {
/** Returns the original NodeProvider that WebView implements. */
private fun getParent(): AccessibilityNodeProvider? {
@@ -262,7 +262,7 @@
override fun getAccessibilityNodeProvider(): AccessibilityNodeProvider? {
val p = super.getAccessibilityNodeProvider()
if (p != null && a11yManager.isEnabled) {
- return mA11yNodeProvider
+ return a11yNodeProvider
}
return p
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
index 2796b86..5271e8b 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
@@ -60,12 +60,12 @@
class VmLauncherService : Service() {
// TODO: using lateinit for some fields to avoid null
- private var mExecutorService: ExecutorService? = null
- private var mVirtualMachine: VirtualMachine? = null
- private var mResultReceiver: ResultReceiver? = null
- private var mServer: Server? = null
- private var mDebianService: DebianServiceImpl? = null
- private var mPortNotifier: PortNotifier? = null
+ private var executorService: ExecutorService? = null
+ private var virtualMachine: VirtualMachine? = null
+ private var resultReceiver: ResultReceiver? = null
+ private var server: Server? = null
+ private var debianService: DebianServiceImpl? = null
+ private var portNotifier: PortNotifier? = null
interface VmLauncherServiceCallback {
fun onVmStart()
@@ -81,7 +81,7 @@
override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
if (intent.action == ACTION_STOP_VM_LAUNCHER_SERVICE) {
- if (mDebianService != null && mDebianService!!.shutdownDebian()) {
+ if (debianService != null && debianService!!.shutdownDebian()) {
// During shutdown, change the notification content to indicate that it's closing
val notification = createNotificationForTerminalClose()
getSystemService<NotificationManager?>(NotificationManager::class.java)
@@ -92,11 +92,11 @@
}
return START_NOT_STICKY
}
- if (mVirtualMachine != null) {
+ if (virtualMachine != null) {
Log.d(TAG, "VM instance is already started")
return START_NOT_STICKY
}
- mExecutorService = Executors.newCachedThreadPool(TerminalThreadFactory(applicationContext))
+ executorService = Executors.newCachedThreadPool(TerminalThreadFactory(applicationContext))
val image = InstalledImage.getDefault(this)
val json = ConfigJson.from(this, image.configPath)
@@ -117,28 +117,28 @@
Trace.endSection()
Trace.beginAsyncSection("debianBoot", 0)
- mVirtualMachine = runner.vm
- mResultReceiver =
+ virtualMachine = runner.vm
+ resultReceiver =
intent.getParcelableExtra<ResultReceiver?>(
Intent.EXTRA_RESULT_RECEIVER,
ResultReceiver::class.java,
)
runner.exitStatus.thenAcceptAsync { success: Boolean ->
- mResultReceiver?.send(if (success) RESULT_STOP else RESULT_ERROR, null)
+ resultReceiver?.send(if (success) RESULT_STOP else RESULT_ERROR, null)
stopSelf()
}
- val logPath = getFileStreamPath(mVirtualMachine!!.name + ".log").toPath()
- Logger.setup(mVirtualMachine!!, logPath, mExecutorService!!)
+ val logPath = getFileStreamPath(virtualMachine!!.name + ".log").toPath()
+ Logger.setup(virtualMachine!!, logPath, executorService!!)
val notification =
intent.getParcelableExtra<Notification?>(EXTRA_NOTIFICATION, Notification::class.java)
startForeground(this.hashCode(), notification)
- mResultReceiver!!.send(RESULT_START, null)
+ resultReceiver!!.send(RESULT_START, null)
- mPortNotifier = PortNotifier(this)
+ portNotifier = PortNotifier(this)
// TODO: dedup this part
val nsdManager = getSystemService<NsdManager?>(NsdManager::class.java)
@@ -147,7 +147,7 @@
info.serviceName = "ttyd"
nsdManager.registerServiceInfoCallback(
info,
- mExecutorService!!,
+ executorService!!,
object : NsdManager.ServiceInfoCallback {
override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {}
@@ -245,11 +245,11 @@
try {
// TODO(b/372666638): gRPC for java doesn't support vsock for now.
val port = 0
- mDebianService = DebianServiceImpl(this)
- mServer =
+ debianService = DebianServiceImpl(this)
+ server =
OkHttpServerBuilder.forPort(port, InsecureServerCredentials.create())
.intercept(interceptor)
- .addService(mDebianService)
+ .addService(debianService)
.build()
.start()
} catch (e: IOException) {
@@ -257,13 +257,13 @@
return
}
- mExecutorService!!.execute(
+ executorService!!.execute(
Runnable {
// TODO(b/373533555): we can use mDNS for that.
val debianServicePortFile = File(filesDir, "debian_service_port")
try {
FileOutputStream(debianServicePortFile).use { writer ->
- writer.write(mServer!!.port.toString().toByteArray())
+ writer.write(server!!.port.toString().toByteArray())
}
} catch (e: IOException) {
Log.d(TAG, "cannot write grpc port number", e)
@@ -273,28 +273,28 @@
}
override fun onDestroy() {
- mPortNotifier?.stop()
+ portNotifier?.stop()
getSystemService<NotificationManager?>(NotificationManager::class.java).cancelAll()
stopDebianServer()
- if (mVirtualMachine != null) {
- if (mVirtualMachine!!.getStatus() == VirtualMachine.STATUS_RUNNING) {
+ if (virtualMachine != null) {
+ if (virtualMachine!!.getStatus() == VirtualMachine.STATUS_RUNNING) {
try {
- mVirtualMachine!!.stop()
+ virtualMachine!!.stop()
stopForeground(STOP_FOREGROUND_REMOVE)
} catch (e: VirtualMachineException) {
Log.e(TAG, "failed to stop a VM instance", e)
}
}
- mExecutorService?.shutdownNow()
- mExecutorService = null
- mVirtualMachine = null
+ executorService?.shutdownNow()
+ executorService = null
+ virtualMachine = null
}
super.onDestroy()
}
private fun stopDebianServer() {
- mDebianService?.killForwarderHost()
- mServer?.shutdown()
+ debianService?.killForwarderHost()
+ server?.shutdown()
}
companion object {