| commit | 4d8631f849947da72c371a999c0975bb9bfc91e8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Nov 04 17:59:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 04 17:59:42 2024 +0000 |
| tree | 7a94ffa236f79b55f1adfba206f0b8a52bc845d8 | |
| parent | 28ef6ba54d94b2856ae68490b7be0cb2746d169e [diff] | |
| parent | 71707037b1fa91fa376e4b173fad5b32eb183730 [diff] |
Merge "libsnapuserd: Handle empty response from server" into main am: 71707037b1 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3329574 Change-Id: Ib5b59644231c823abe4a0ed2e40a0d40e26d53bc 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); }