Move launchErrorActivity into ErrorActivity
Bug: N/A
Test: N/A
Change-Id: I0ee8d870964839be6eb78a82340ff4095977361b
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/ErrorActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/ErrorActivity.java
index ee1f1ad..44dcce5 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/ErrorActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/ErrorActivity.java
@@ -16,6 +16,7 @@
package com.android.virtualization.terminal;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -25,7 +26,14 @@
import androidx.annotation.Nullable;
public class ErrorActivity extends BaseActivity {
- public static final String EXTRA_CAUSE = "cause";
+ private static final String EXTRA_CAUSE = "cause";
+
+ public static void start(Context context, Exception e) {
+ Intent intent = new Intent(context, ErrorActivity.class);
+ intent.putExtra(EXTRA_CAUSE, e);
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
+ }
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index a3b0577..ded186f 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -197,7 +197,7 @@
public boolean dispatchKeyEvent(KeyEvent event) {
if (Build.isDebuggable() && event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
if (event.getAction() == KeyEvent.ACTION_UP) {
- launchErrorActivity(new Exception("Debug: KeyEvent.KEYCODE_UNKNOWN"));
+ ErrorActivity.start(this, new Exception("Debug: KeyEvent.KEYCODE_UNKNOWN"));
}
return true;
}
@@ -444,7 +444,8 @@
@Override
public void onVmError() {
Log.i(TAG, "onVmError()");
- launchErrorActivity(new Exception("onVmError"));
+ // TODO: error cause is too simple.
+ ErrorActivity.start(this, new Exception("onVmError"));
}
@Override
@@ -501,13 +502,6 @@
}
}
- private void launchErrorActivity(Exception e) {
- Intent intent = new Intent(this, ErrorActivity.class);
- intent.putExtra(ErrorActivity.EXTRA_CAUSE, e);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
- this.startActivity(intent);
- }
-
private boolean installIfNecessary() {
// If payload from external storage exists(only for debuggable build) or there is no
// installed image, launch installer activity.