diff options
| author | Erwin Jansen <jansene@google.com> | 2023-04-20 04:28:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 04:28:55 +0000 |
| commit | 0e4606c757ee59fc680471c48e669cc854ec2e76 (patch) | |
| tree | b194904193eb826dd2123755a158819e1442e53f | |
| parent | eb621c347ca5f148cd2e8270ba40bdfeb363b087 (diff) | |
| parent | 20e3b7c98bb5e7ac3a7e6ba25bdf1cb6e026f2c7 (diff) | |
| download | aemu-0e4606c757ee59fc680471c48e669cc854ec2e76.tar.gz | |
Merge "Update agents to support UI separation" am: d015d45eed am: 678cfdd069 am: 20e3b7c98b
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2526219
Change-Id: I1f6ac3b847792068459389b655ddcac367af0f04
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 |