commit 4d43739814cd47374bd3c8e6c4b85d26a9f0cfc0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 21 08:28:23 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 21 08:28:23 2025 -0700
tree 006454d25ad5b620c74496350aed7eccaab84f8f
parent a2c794beb079f669a6f2596b17139f358f538af6
parent 747705296acaef4c4665d3294062553822c46ff1

Merge "Check activity != null before accessing it" into main

android/TerminalApp/java/com/android/virtualization/terminal/TerminalTabFragment.kt

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/TerminalTabFragment.kt b/android/TerminalApp/java/com/android/virtualization/terminal/TerminalTabFragment.kt
index 72dea5c..8106f6e 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/TerminalTabFragment.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/TerminalTabFragment.kt
@@ -216,7 +216,7 @@
     }
 
     private fun updateMainActivity() {
-        val mainActivity = (activity as MainActivity)
+        val mainActivity = activity as MainActivity ?: return
         if (terminalGuiSupport()) {
             mainActivity.displayMenu!!.visibility = View.VISIBLE
             mainActivity.displayMenu!!.isEnabled = true