Exit the agent if an adb reboot doesn't restore connectivity

catchpoint · Oct 19, 2018 · 71f1fd5 · 71f1fd5
1 parent 8d104db
commit 71f1fd5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/internal/adb.py b/internal/adb.py
@@ -34,6 +34,7 @@ def __init__(self, options, cache_dir):
         self.simplert = None
         self.no_network_count = 0
         self.needs_exit = False
+        self.rebooted = False
         self.vpn_forwarder = None
         self.known_apps = {
             'com.motorola.ccc.ota': {},
@@ -658,6 +659,7 @@ def is_device_ready(self):
             net_ok = False
             if self.ping(self.ping_address) is not None:
                 self.no_network_count = 0
+                self.rebooted = False
                 net_ok = True
             else:
                 addresses = []
@@ -695,8 +697,12 @@ def is_device_ready(self):
                 is_ready = False
         if not is_ready and self.no_network_count > 20:
             self.no_network_count = 0
-            self.adb(['reboot'])
-            self.adb(['wait-for-device'])
+            if self.rebooted:
+                self.needs_exit = True
+            else:
+                self.adb(['reboot'])
+                self.adb(['wait-for-device'])
+                self.rebooted = True
         if is_ready and not self.initialized:
             self.initialized = True
             # Disable emergency alert notifications