OSDN Git Service

Merge changes I0baf582f,I4bba01ba
authorJunyu Lai <junyulai@google.com>
Thu, 28 Mar 2019 00:53:20 +0000 (00:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 Mar 2019 00:53:20 +0000 (00:53 +0000)
commite5ee6b9b312aa902bbaf1c58afb6fd1307ca953c
tree466eb6a4cd4046f1487da461cc51e17120711698
parent6a753ba787dc410625c49ee18b1365ba19ee4928
parent15178155e0e19d8ca4bd8ee66f9b560d9feb5ae7
Merge changes I0baf582f,I4bba01ba

* changes:
  Block unpriviledged apps which create keepalives with null fd
  Fix keepalive don't get removed when lower layer error
tests/net/java/com/android/server/ConnectivityServiceTest.java