Put all logs from the VmTerminalApp under the same TAG
Bug: N/A
Test: N/A
Change-Id: I561bf295b47adabb6de45577bd40f91fd144e34c
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/CertificateUtils.java b/android/TerminalApp/java/com/android/virtualization/terminal/CertificateUtils.java
index 01d2afa..fa5c382 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/CertificateUtils.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/CertificateUtils.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.content.Context;
import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProperties;
@@ -37,8 +39,6 @@
import java.security.cert.X509Certificate;
public class CertificateUtils {
- private static final String TAG = "CertificateUtils";
-
private static final String ALIAS = "ttyd";
public static KeyStore.PrivateKeyEntry createOrGetKey() {
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java b/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
index 1b2ce8c..93b0b0c 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;
@@ -37,7 +39,11 @@
import java.util.Set;
final class DebianServiceImpl extends DebianServiceGrpc.DebianServiceImplBase {
- public static final String TAG = "DebianService";
+ private static final String PREFERENCE_FILE_KEY =
+ "com.android.virtualization.terminal.PREFERENCE_FILE_KEY";
+ private static final String PREFERENCE_FORWARDING_PORTS = "PREFERENCE_FORWARDING_PORTS";
+ private static final String PREFERENCE_FORWARDING_PORT_IS_ENABLED_PREFIX =
+ "PREFERENCE_FORWARDING_PORT_IS_ENABLED_";
private final Context mContext;
private final SharedPreferences mSharedPref;
@@ -66,7 +72,7 @@
public void reportVmActivePorts(
ReportVmActivePortsRequest request,
StreamObserver<ReportVmActivePortsResponse> responseObserver) {
- Log.d(DebianServiceImpl.TAG, "reportVmActivePorts: " + request.toString());
+ Log.d(TAG, "reportVmActivePorts: " + request.toString());
Set<String> prevPorts =
mSharedPref.getStringSet(mPreferenceForwardingPorts, Collections.emptySet());
@@ -93,7 +99,7 @@
@Override
public void reportVmIpAddr(
IpAddr request, StreamObserver<ReportVmIpAddrResponse> responseObserver) {
- Log.d(DebianServiceImpl.TAG, "reportVmIpAddr: " + request.toString());
+ Log.d(TAG, "reportVmIpAddr: " + request.toString());
mCallback.onIpAddressAvailable(request.getAddr());
ReportVmIpAddrResponse reply = ReportVmIpAddrResponse.newBuilder().setSuccess(true).build();
responseObserver.onNext(reply);
@@ -103,7 +109,7 @@
@Override
public void openForwardingRequestQueue(
QueueOpeningRequest request, StreamObserver<ForwardingRequestItem> responseObserver) {
- Log.d(DebianServiceImpl.TAG, "OpenForwardingRequestQueue");
+ Log.d(TAG, "OpenForwardingRequestQueue");
mPortForwardingListener =
new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
@@ -144,7 +150,7 @@
private static native void terminateForwarderHost();
void killForwarderHost() {
- Log.d(DebianServiceImpl.TAG, "Stopping port forwarding");
+ Log.d(TAG, "Stopping port forwarding");
if (mPortForwardingListener != null) {
mSharedPref.unregisterOnSharedPreferenceChangeListener(mPortForwardingListener);
terminateForwarderHost();
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallUtils.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallUtils.java
index b17e636..71f2a2d 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallUtils.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallUtils.java
@@ -15,6 +15,8 @@
*/
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.content.Context;
import android.os.Environment;
import android.os.FileUtils;
@@ -38,8 +40,6 @@
import java.util.function.Function;
public class InstallUtils {
- private static final String TAG = InstallUtils.class.getSimpleName();
-
private static final String VM_CONFIG_FILENAME = "vm_config.json";
private static final String COMPRESSED_PAYLOAD_FILENAME = "images.tar.gz";
private static final String ROOTFS_FILENAME = "root_part";
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
index 45da73c..52ef3d4 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.annotation.MainThread;
import android.content.ComponentName;
import android.content.Context;
@@ -42,8 +44,6 @@
import java.lang.ref.WeakReference;
public class InstallerActivity extends BaseActivity {
- private static final String TAG = "LinuxInstaller";
-
private static final long ESTIMATED_IMG_SIZE_BYTES = FileUtils.parseSize("550MB");
private CheckBox mWaitForWifiCheckbox;
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
index 5d4c4ad..6fd3b5c 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.app.Notification;
import android.app.PendingIntent;
import android.app.Service;
@@ -55,8 +57,6 @@
import java.util.concurrent.Executors;
public class InstallerService extends Service {
- private static final String TAG = "InstallerService";
-
private static final int NOTIFICATION_ID = 1313; // any unique number among notifications
private static final String IMAGE_URL =
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/Runner.java b/android/TerminalApp/java/com/android/virtualization/terminal/Runner.java
index a2247b1..4094025 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/Runner.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/Runner.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.content.Context;
import android.system.virtualmachine.VirtualMachine;
import android.system.virtualmachine.VirtualMachineCallback;
@@ -30,7 +32,6 @@
/** Utility class for creating a VM and waiting for it to finish. */
class Runner {
- private static final String TAG = Runner.class.getSimpleName();
private final VirtualMachine mVirtualMachine;
private final Callback mCallback;
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
index 32df273..1b39ff0 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
@@ -28,9 +28,9 @@
import androidx.core.app.ActivityCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import com.android.virtualization.terminal.MainActivity.TAG
class SettingsPortForwardingActivity : AppCompatActivity() {
- val TAG: String = "VmTerminalApp"
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_port_forwarding)
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
index ef76e03..e291b57 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
@@ -22,6 +22,7 @@
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
+import com.android.virtualization.terminal.MainActivity.TAG
import com.google.android.material.card.MaterialCardView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
@@ -30,8 +31,6 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
-const val TAG: String = "VmTerminalApp"
-
class SettingsRecoveryActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -123,4 +122,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
index 06ecab1..32d534a 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -60,7 +62,6 @@
public class VmLauncherService extends Service implements DebianServiceImpl.DebianServiceCallback {
public static final String EXTRA_NOTIFICATION = "EXTRA_NOTIFICATION";
- static final String TAG = "VmLauncherService";
private static final int RESULT_START = 0;
private static final int RESULT_STOP = 1;
@@ -336,7 +337,7 @@
enabled);
editor.apply();
- context.getSystemService(NotificationManager.class).cancel(VmLauncherService.TAG, port);
+ context.getSystemService(NotificationManager.class).cancel(TAG, port);
}
}
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherServices.java b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherServices.java
index d6c6786..aad95cb 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherServices.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherServices.java
@@ -16,6 +16,8 @@
package com.android.virtualization.terminal;
+import static com.android.virtualization.terminal.MainActivity.TAG;
+
import android.app.Notification;
import android.content.Context;
import android.content.Intent;
@@ -31,8 +33,6 @@
import java.util.List;
public class VmLauncherServices {
- private static final String TAG = "VmLauncherServices";
-
private static final String ACTION_START_VM_LAUNCHER_SERVICE =
"android.virtualization.START_VM_LAUNCHER_SERVICE";