commit a35f7bf829009532dbbe3385f576a120af3ed5af
author Jeongik Cha <jeongik@google.com> Mon Nov 25 06:31:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 25 06:31:14 2024 +0000
tree 969b2ba3ab742f52f42543f495094f0c316eb45b
parent ff4d725b7ce7f2f8e8c67635066c685e83ed2bcb
parent 799d62d1e63b02db34e8445f3c7d81d55d5863df

Merge changes Id8f0bf97,I6626b8e1 into main

* changes:
  Move connectToTerminalService into startVm
  set nocache option in webview

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

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 48d5190..fdfdc69 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -15,6 +15,8 @@
  */
 package com.android.virtualization.terminal;
 
+import static android.webkit.WebSettings.LOAD_NO_CACHE;
+
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -129,6 +131,7 @@
         mWebView.getSettings().setDatabaseEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.getSettings().setCacheMode(LOAD_NO_CACHE);
         mWebView.setWebChromeClient(new WebChromeClient());
 
         setupModifierKeys();
@@ -137,7 +140,6 @@
         mAccessibilityManager.addAccessibilityStateChangeListener(this);
 
         readClientCertificate();
-        connectToTerminalService();
 
         mManageExternalStorageActivityResultLauncher =
                 registerForActivityResult(
@@ -560,6 +562,7 @@
 
         android.os.Trace.beginAsyncSection("executeTerminal", 0);
         VmLauncherServices.startVmLauncherService(this, this, notification);
+        connectToTerminalService();
     }
 
     @VisibleForTesting