Skip to content

Commit 7175385

Browse files
muhomorrthestinger
authored andcommitted
adjust flag definitions to upstream changes
1 parent 6f4ed92 commit 7175385

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.android.system.virtualmachine.flags;
2+
3+
object Flags {
4+
fun terminalGuiSupport(): Boolean = true
5+
fun terminalStorageBalloon(): Boolean = false
6+
}

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import androidx.activity.viewModels
4949
import androidx.viewpager2.widget.ViewPager2
5050
import com.android.internal.annotations.VisibleForTesting
5151
import com.android.microdroid.test.common.DeviceProperties
52+
import com.android.system.virtualmachine.flags.Flags
5253
import com.android.virtualization.terminal.ErrorActivity.Companion.start
5354
import com.android.virtualization.terminal.VmLauncherService.VmLauncherServiceCallback
5455
import com.google.android.material.tabs.TabLayout

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import android.webkit.WebViewClient
3434
import android.widget.TextView
3535
import androidx.fragment.app.Fragment
3636
import androidx.fragment.app.activityViewModels
37+
import com.android.system.virtualmachine.flags.Flags
3738
import com.android.virtualization.terminal.CertificateUtils.createOrGetKey
3839
import com.android.virtualization.terminal.CertificateUtils.writeCertificateToFile
3940
import java.security.PrivateKey
@@ -201,7 +202,7 @@ class TerminalTabFragment() : Fragment() {
201202

202203
private fun updateMainActivity() {
203204
val mainActivity = (activity as MainActivity)
204-
if (terminalGuiSupport()) {
205+
if (Flags.terminalGuiSupport()) {
205206
mainActivity.displayMenu!!.visibility = View.VISIBLE
206207
mainActivity.displayMenu!!.isEnabled = true
207208
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import android.system.virtualmachine.VirtualMachineException
4040
import android.util.Log
4141
import android.widget.Toast
4242
import androidx.annotation.WorkerThread
43+
import com.android.system.virtualmachine.flags.Flags
4344
import com.android.virtualization.terminal.InstalledImage.Companion.roundUp
4445
import com.android.virtualization.terminal.MainActivity.Companion.PREFIX
4546
import com.android.virtualization.terminal.MainActivity.Companion.TAG

0 commit comments

Comments
 (0)