aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2023-04-20 04:50:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-04-20 04:50:01 +0000
commit0dec4e3c538b870a6f89661ff39eb96887f87d2f (patch)
treec05af90b83605393337e4f1113d896af3915644a
parentd015d45eed6c23bcbd4c5a0e1d6df87a38cc42f4 (diff)
parent50aa7b691e816724b67bf42f6729c3b380257945 (diff)
downloadaemu-0dec4e3c538b870a6f89661ff39eb96887f87d2f.tar.gz
Merge "Revert "Update agents to support UI separation""
-rw-r--r--host-common/include/host-common/vm_operations.h3
-rw-r--r--host-common/include/host-common/window_agent.h6
2 files changed, 0 insertions, 9 deletions
diff --git a/host-common/include/host-common/vm_operations.h b/host-common/include/host-common/vm_operations.h
index 5dcd6c1..375d1bc 100644
--- a/host-common/include/host-common/vm_operations.h
+++ b/host-common/include/host-common/vm_operations.h
@@ -248,8 +248,5 @@ typedef struct QAndroidVmOperations {
// virtio display
bool (*setDisplay)(int32_t id, int32_t w, int32_t h, uint32_t dpi);
-
- // Reset the machine
- void (*system_shutdown_request)(QemuShutdownCause reason);
} QAndroidVmOperations;
ANDROID_END_HEADER
diff --git a/host-common/include/host-common/window_agent.h b/host-common/include/host-common/window_agent.h
index be16f13..a9489e0 100644
--- a/host-common/include/host-common/window_agent.h
+++ b/host-common/include/host-common/window_agent.h
@@ -36,9 +36,6 @@ typedef enum {
} WindowMessageType;
typedef struct {} MultiDisplayPageChangeEvent;
-typedef struct SkinLayout SkinLayout;
-typedef struct QFrame QFrame;
-typedef struct SkinEvent SKinEvent;
static const int kWindowMessageTimeoutInfinite = -1;
@@ -131,9 +128,6 @@ typedef struct QAndroidEmulatorWindowAgent {
void (*quit_request)(void);
void (*getWindowPosition)(int*, int*);
bool (*hasWindow)();
-
- bool (*userSettingIsDontSaveSnapshot)(void);
- void (*setUserSettingIsDontSaveSnapshot)(bool);
} QAndroidEmulatorWindowAgent;
#ifndef USING_ANDROID_BP