diff options
| author | Erwin Jansen <jansene@google.com> | 2023-04-21 05:44:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-21 05:44:06 +0000 |
| commit | 1bb16a2547ae3e0ac327885419acf21614adb3fc (patch) | |
| tree | b194904193eb826dd2123755a158819e1442e53f | |
| parent | ad3c0ca12fb4637f4f49548b95f9f973065e2207 (diff) | |
| parent | f053c9850a9625e6c85b795293d8ad580993f0e3 (diff) | |
| download | aemu-1bb16a2547ae3e0ac327885419acf21614adb3fc.tar.gz | |
Revert^2 "Update agents to support UI separation"" am: f053c9850a
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2553210
Change-Id: Id3e0a9bc4c6e708246d15f6e48838d30c2b88134
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, 9 insertions, 0 deletions
diff --git a/host-common/include/host-common/vm_operations.h b/host-common/include/host-common/vm_operations.h index 375d1bc..5dcd6c1 100644 --- a/host-common/include/host-common/vm_operations.h +++ b/host-common/include/host-common/vm_operations.h @@ -248,5 +248,8 @@ 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 a9489e0..be16f13 100644 --- a/host-common/include/host-common/window_agent.h +++ b/host-common/include/host-common/window_agent.h @@ -36,6 +36,9 @@ typedef enum { } WindowMessageType; typedef struct {} MultiDisplayPageChangeEvent; +typedef struct SkinLayout SkinLayout; +typedef struct QFrame QFrame; +typedef struct SkinEvent SKinEvent; static const int kWindowMessageTimeoutInfinite = -1; @@ -128,6 +131,9 @@ typedef struct QAndroidEmulatorWindowAgent { void (*quit_request)(void); void (*getWindowPosition)(int*, int*); bool (*hasWindow)(); + + bool (*userSettingIsDontSaveSnapshot)(void); + void (*setUserSettingIsDontSaveSnapshot)(bool); } QAndroidEmulatorWindowAgent; #ifndef USING_ANDROID_BP |