do not catch OSError in pipe.send (fix ANR on some versions of Android)
This commit is contained in:
@@ -297,8 +297,8 @@ class Interface(util.PrintError):
|
||||
wire_requests = self.unsent_requests[0:n]
|
||||
try:
|
||||
self.pipe.send_all([make_dict(*r) for r in wire_requests])
|
||||
except socket.error as e:
|
||||
self.print_error("socket error:", e)
|
||||
except BaseException as e:
|
||||
self.print_error("pipe send error:", e)
|
||||
return False
|
||||
self.unsent_requests = self.unsent_requests[n:]
|
||||
for request in wire_requests:
|
||||
|
||||
@@ -736,10 +736,6 @@ class SocketPipe:
|
||||
print_error("SSLError:", e)
|
||||
time.sleep(0.1)
|
||||
continue
|
||||
except OSError as e:
|
||||
print_error("OSError", e)
|
||||
time.sleep(0.1)
|
||||
continue
|
||||
|
||||
|
||||
class QueuePipe:
|
||||
|
||||
Reference in New Issue
Block a user