diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-22 03:07:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-22 03:07:15 +0000 |
| commit | e21410380a655e6848e42f2d3d41ad5d9644ab4e (patch) | |
| tree | b194904193eb826dd2123755a158819e1442e53f | |
| parent | 5bc97333efa88022b1322295be5f550b314db8fa (diff) | |
| parent | 6244bc49afa1851fc0c4d1afd8bdbb1173c4f547 (diff) | |
| download | aemu-android14-gsi.tar.gz | |
Snap for 9990577 from c1257c34e268452f6635a079cb5bda2cf602af10 to udc-release am: 6244bc49afandroid14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/aemu/+/22798031
Change-Id: Ie81fbba04fb077c1abb75ef2801c559d2bae096a
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 |