commit 03990d4e0fbff17c24f384827e5fa107abf4bdef
author Jeongik Cha <jeongik@google.com> Fri Jan 31 17:27:18 2025 +0900
committer Jeongik Cha <jeongik@google.com> Fri Jan 31 00:35:25 2025 -0800
tree 3c1c467b7d8bc93df650d54cb9352f1a35d5f88b
parent 918b2d145fd3050f9f57f8d62dae4fd20dc743f9

Set different affinity for display activity

Bug: 389524419
Test: run display activity
Change-Id: I170b032e014f708b383949ab6d50ace8069a60e9

android/TerminalApp/AndroidManifest.xml

diff --git a/android/TerminalApp/AndroidManifest.xml b/android/TerminalApp/AndroidManifest.xml
index c11b1a0..8ed2f79 100644
--- a/android/TerminalApp/AndroidManifest.xml
+++ b/android/TerminalApp/AndroidManifest.xml
@@ -48,6 +48,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".DisplayActivity"
+            android:taskAffinity="com.android.virtualization.terminal.display"
             android:screenOrientation="landscape"
             android:resizeableActivity="false"
             android:theme="@style/FullscreenTheme"

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 1daeadb..0f18261 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.kt
@@ -368,6 +368,8 @@
             return true
         } else if (id == R.id.menu_item_display) {
             val intent = Intent(this, DisplayActivity::class.java)
+            intent.flags =
+                intent.flags or Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             this.startActivity(intent)
             return true
         }