Increase timeouts.
There is still some flakiness, so increase the timeout values. Also remove the TEMP_FAILURE_RETRY macro usage in TIMEOUT calls. That macro disables the ability of the alarm code to interrupt the system call. Bug: 141045754 Bug: 149562320 Test: Unit tests pass. Change-Id: Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3 Merged-In: Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3 (cherry picked from commit 11555f09)
Loading