commit f225aa3f24e739ef288f97e989ecc41a3e3e34c0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 27 06:14:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 06:14:16 2020 +0000
tree 5e87e206844137afda4fbdae1148d641f68d7442
parent 919678bcbe30643f2092a50b5cdb19265477570f
parent 82f715b7b5bd8fded0e9558ef819d7a4717dc60a

Merge "adb: fix bugreport status line."

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 1eec6a4..b825805 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -2505,7 +2505,9 @@
     }
 
     UpdateState state = ProcessUpdateState([&]() -> bool {
-        callback();
+        if (callback) {
+            callback();
+        }
         return true;
     });
     LOG(INFO) << "Update state in recovery: " << state;

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 81a097e..a88d127 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -138,7 +138,7 @@
 
 static void WakeEpoll() {
     constexpr char value[] = "1";
-    write(wake_epoll_fd, value, sizeof(value));
+    TEMP_FAILURE_RETRY(write(wake_epoll_fd, value, sizeof(value)));
 }
 
 static class PropWaiterState {