commit 7a7447cda730955d3735ba194b4d6da2a2a01049
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 06 10:56:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 06 10:56:18 2024 +0000
tree 2863e608787f6cddebe0df12ac9bb4c3f76daecf
parent 5aef3f49a691c063db74892f4a53e1e78183763c
parent 27bacb97d975b77e0a52c44f7f501172b6742d29

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

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

Change-Id: I547bf1bf5acf536d1596c312437754e1556c366a
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) {