tree 6b7f9a335e98990a107c401411b4dc9c166bc72f
parent 2a198de79d0d5b93168a3fccd45977f5731b3451
parent 0bc356687e022fa1ae611c4ebeb0e0622810d7e4
author Lorenzo Colitti <lorenzo@google.com> 1441759122 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441759122 +0000

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

* commit '0bc356687e022fa1ae611c4ebeb0e0622810d7e4':
  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.