| commit | 3e15360bdbba48610e4fe7eace0459997cb87fe9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Mar 21 08:42:46 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 21 08:42:46 2025 -0700 |
| tree | 7b5690d5f7fe5c418482f8d11b95683ae9f7215b | |
| parent | 38926acf1d5727b94a7f077bcd04c8b6703e4ffe [diff] | |
| parent | 4d43739814cd47374bd3c8e6c4b85d26a9f0cfc0 [diff] |
Merge "Check activity != null before accessing it" into main am: 4d43739814 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3556045 Change-Id: I46f042dfacb91899cb3970b7484e4d8bf90d89c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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