commit 7850d056e8c445baa999d2781619a3781a674e72
author Jiyong Park <jiyong@google.com> Mon Nov 25 16:21:36 2024 +0900
committer Jiyong Park <jiyong@google.com> Mon Nov 25 18:32:02 2024 +0900
tree 0238877e8f11a2020d64273409991237f41e73e2
parent 8562d2a4cb895828a170b5fedf6e68d15c0ef0ce

Use explicit intent for identifying the VmLauncherService

Bug: N/A
Test: N/A
Change-Id: I1f2390ac1c9851bc194b69c4577db9e0bcdc13f2

android/TerminalApp/AndroidManifest.xml

diff --git a/android/TerminalApp/AndroidManifest.xml b/android/TerminalApp/AndroidManifest.xml
index dad07ee..a9d6e9d 100644
--- a/android/TerminalApp/AndroidManifest.xml
+++ b/android/TerminalApp/AndroidManifest.xml
@@ -83,10 +83,6 @@
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
                 android:value="Run VM instances" />
-            <intent-filter>
-                <action android:name="android.virtualization.START_VM_LAUNCHER_SERVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </service>
     </application>
 

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 a46d0b4..9ce9ac2 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
@@ -84,32 +84,18 @@
     private DebianServiceImpl mDebianService;
     private PortForwardingRequestReceiver mPortForwardingReceiver;
 
-    private static Intent buildVmLauncherServiceIntent(Context context) {
-        Intent i = new Intent();
-        i.setAction(ACTION_START_VM_LAUNCHER_SERVICE);
-
-        Intent intent = new Intent(ACTION_START_VM_LAUNCHER_SERVICE);
-        PackageManager pm = context.getPackageManager();
-        List<ResolveInfo> resolveInfos =
-                pm.queryIntentServices(intent, PackageManager.MATCH_DEFAULT_ONLY);
-        if (resolveInfos == null || resolveInfos.size() != 1) {
-            Log.e(TAG, "cannot find a service to handle ACTION_START_VM_LAUNCHER_SERVICE");
-            return null;
-        }
-        String packageName = resolveInfos.get(0).serviceInfo.packageName;
-
-        i.setPackage(packageName);
-        return i;
+    private static Intent getMyIntent(Context context) {
+        return new Intent(context.getApplicationContext(), VmLauncherService.class);
     }
 
     public static void stopVmLauncherService(Context context) {
-        Intent i = buildVmLauncherServiceIntent(context);
+        Intent i = getMyIntent(context);
         context.stopService(i);
     }
 
     public static void startVmLauncherService(
             Context context, VmLauncherServiceCallback callback, Notification notification) {
-        Intent i = buildVmLauncherServiceIntent(context);
+        Intent i = getMyIntent(context);
         if (i == null) {
             return;
         }