commit 643c0a6a40362aa8b12a8b7f83cee08732b72f6c
author Jeongik Cha <jeongik@google.com> Fri Dec 06 06:16:52 2024 +0000
committer Jeongik Cha <jeongik@google.com> Fri Dec 06 15:22:25 2024 +0900
tree f80beb85fdf2e2eea28bc35b26ff202971389e06
parent a1df08675d3df8e3ddee144909146b58f44dd929

Add null check for PortNotifier

for onStartCommand error case or call `ACTION_STOP_VM_LAUNCHER_SERVICE`
before normal case.

Bug: n/a
Change-Id: I23803249df2e53835627ba562144d5a242abbce0
Test: build

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