commit 0bc356687e022fa1ae611c4ebeb0e0622810d7e4
author Lorenzo Colitti <lorenzo@google.com> Wed Sep 09 00:26:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 00:26:53 2015 +0000
tree 5555d8ca836c8522959c00aa3e5ebac3a671f4f0
parent 975ceef616aac6de561c4a4e1d82a636f5cf37e3
parent 017223acda5bfe16cb87d0a33d72dd28d2fccd3b

am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.