summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2016-10-27 15:05:50 -0700
committerLorenzo Colitti <lorenzo@google.com>2017-01-18 19:08:11 +0900
commit4fde167490f3c0fc3f46c07b8c2c58c45ee97ab7 (patch)
tree99d41cbe033c6927911eef55b2d43a84394c05dd /tools/aapt2/diff/Diff.cpp
parent1e04e9ee490c85f234e6e84722a59a7e784724c0 (diff)
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never becomes available. Once a network is available the timeout is canceled. Bug: 31402633 Test: all timeout related unit tests pass (new one added) (cherry picked from commit 681fcda5896fd6c94f8a543ef9983c0a0644e87e) (cherry picked from commit bf3b1bad15f45033d409669ac20e4b4e597065fd) Change-Id: I0cf1a2b7d25bc9912e03fca30621809a9071396c
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions