commit 2a639ab046382fa8bfab63bf13ac00f79410c6cf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 06 10:09:17 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 06 10:09:17 2024 +0000
tree 4d2c7bc0c0055a2260b493c9f96a454f0aff3bf6
parent fb153822b9f4c05b4f9ec40dfd0e772483d5b0c1
parent 643c0a6a40362aa8b12a8b7f83cee08732b72f6c

Merge "Add null check for PortNotifier" into main

android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
index a82c688..ee2a6b8 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
@@ -298,7 +298,9 @@
 
     @Override
     public void onDestroy() {
-        mPortNotifier.stop();
+        if (mPortNotifier != null) {
+            mPortNotifier.stop();
+        }
         getSystemService(NotificationManager.class).cancelAll();
         stopDebianServer();
         if (mVirtualMachine != null) {