| commit | 829e94415d8df89c0914489516c9a4f662206f49 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Nov 04 18:57:24 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 04 18:57:24 2024 +0000 |
| tree | 2becaef1bfe4b034c5ec2261bd1325afb9365179 | |
| parent | b61f74dcbb6469bf42f4bbc9b0c87988e0b9433b [diff] | |
| parent | 4d8631f849947da72c371a999c0975bb9bfc91e8 [diff] |
Merge "libsnapuserd: Handle empty response from server" into main am: 71707037b1 am: 4d8631f849 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3329574 Change-Id: I8ad5d689cba44b7bdd1cd0024eb08dc56859c993 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp index ddefb9f..7c820f3 100644 --- a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp +++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
@@ -311,6 +311,11 @@ } std::string response = Receivemsg(); + // If server socket disconnects most likely because of device reboot, + // then we just return 0. + if (response.empty()) { + return 0.0; + } return std::stod(response); }