commit 27bacb97d975b77e0a52c44f7f501172b6742d29
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 06 10:33:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 06 10:33:18 2024 +0000
tree 4a62628396c9020eb443b7efa866ebe914717564
parent 3d06dd8fd7eb86c9f1c7867c5534dddb338c81de
parent 2a639ab046382fa8bfab63bf13ac00f79410c6cf

Merge "Add null check for PortNotifier" into main am: 2a639ab046

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3393354

Change-Id: I91402da4444c5c2951170002940dacf534721236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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) {