diff options
| author | Bo Hu <bohu@google.com> | 2023-04-20 06:57:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 06:57:13 +0000 |
| commit | 45a12150da0e42eab921dbb3f01cf08a9c85a3ef (patch) | |
| tree | c05af90b83605393337e4f1113d896af3915644a | |
| parent | 0e4606c757ee59fc680471c48e669cc854ec2e76 (diff) | |
| parent | 3e2ce8498b450a4e86f8fe634221120de31ececa (diff) | |
| download | aemu-45a12150da0e42eab921dbb3f01cf08a9c85a3ef.tar.gz | |
Merge "Revert "Update agents to support UI separation"" am: 0dec4e3c53 am: ad3c0ca12f am: 3e2ce8498b
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2549534
Change-Id: Ib42b1210ed7193d0f801c04e9db5e1b2d9cdcb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | host-common/include/host-common/vm_operations.h | 3 | ||||
| -rw-r--r-- | host-common/include/host-common/window_agent.h | 6 |
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 |