OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc303f4 fd18370)
am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet...
authorLorenzo Colitti <lorenzo@google.com>
Wed, 9 Sep 2015 01:04:38 +0000 (01:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 01:04:38 +0000 (01:04 +0000)
* commit 'fd18370675f8794807747a18276dd7385e25f06e':
  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.

1  2 
core/res/AndroidManifest.xml patch | diff1 | diff2 | blob | history
services/tests/servicestests/AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc core/res/AndroidManifest.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help