Virtualization apex includes terminal app
But the terminal activity is disabled by default.
Bug: 357827587
Test: build
Change-Id: I4374ce47c329fdf386d51ed59f0601ab1df223cb
diff --git a/android/TerminalApp/Android.bp b/android/TerminalApp/Android.bp
index f5f39e3..3ae014e 100644
--- a/android/TerminalApp/Android.bp
+++ b/android/TerminalApp/Android.bp
@@ -10,8 +10,10 @@
"vm_launcher_lib",
],
sdk_version: "system_current",
- product_specific: true,
optimize: {
shrink_resources: true,
},
+ apex_available: [
+ "com.android.virt",
+ ],
}
diff --git a/android/TerminalApp/AndroidManifest.xml b/android/TerminalApp/AndroidManifest.xml
index 07e6147..27b2b46 100644
--- a/android/TerminalApp/AndroidManifest.xml
+++ b/android/TerminalApp/AndroidManifest.xml
@@ -11,7 +11,8 @@
<activity android:name=".MainActivity"
android:screenOrientation="landscape"
android:configChanges="orientation|screenSize|keyboard|keyboardHidden|navigation|uiMode"
- android:exported="true">
+ android:exported="true"
+ android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 3a6ebb8..f493202 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -46,7 +46,10 @@
apps: [
"android.system.virtualmachine.res",
] + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
- true: ["VmLauncherApp"],
+ true: [
+ "VmLauncherApp",
+ "VmTerminalApp",
+ ],
default: [],
}),