commit a89ca27d03ff5f03579a75b5788d5d07dd6e644e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 13 23:21:23 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 13 23:21:23 2025 -0700
tree 389789e1aa071ce21450e1f65dfb83a7e228326a
parent ecec5ba39c62f93d2be6fb90b0a39b23e1bb4a31
parent 329eea7a8a2d64d1a06774704117aa1709ff76ab

Merge "Handle ForegroundServiceStartNotAllowedException when starting the VM" into main am: 329eea7a8a

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

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

android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt
index 35c5570..7502415 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt
@@ -361,8 +361,10 @@
                         .build()
                 )
                 .build()
-
-        run(this, this, notification, getDisplayInfo())
+        run(this, this, notification, getDisplayInfo()).onFailure {
+            Log.e(TAG, "Failed to start VM.", it)
+            finish()
+        }
     }
 
     @VisibleForTesting

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

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
index 1857175..2d7dde9 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
@@ -15,6 +15,7 @@
  */
 package com.android.virtualization.terminal
 
+import android.app.ForegroundServiceStartNotAllowedException
 import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -423,7 +424,7 @@
             callback: VmLauncherServiceCallback?,
             notification: Notification?,
             displayInfo: DisplayInfo,
-        ) {
+        ): Result<Unit> {
             val i = getMyIntent(context)
             val resultReceiver: ResultReceiver =
                 object : ResultReceiver(Handler(Looper.myLooper()!!)) {
@@ -446,7 +447,12 @@
             i.putExtra(Intent.EXTRA_RESULT_RECEIVER, getResultReceiverForIntent(resultReceiver))
             i.putExtra(EXTRA_NOTIFICATION, notification)
             i.putExtra(EXTRA_DISPLAY_INFO, displayInfo)
-            context.startForegroundService(i)
+            return try {
+                context.startForegroundService(i)
+                Result.success(Unit)
+            } catch (e: ForegroundServiceStartNotAllowedException) {
+                Result.failure<Unit>(e)
+            }
         }
 
         private fun getResultReceiverForIntent(r: ResultReceiver): ResultReceiver {