commit b15da9fb19e5e8e902c4bc7836505ec8e12720ac
author Mark Chien <markchien@google.com> Thu Mar 28 23:34:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 23:34:48 2019 -0700
tree b4f7c011e19fb5d349e778eeae3d451d098b663c
parent 391b3aa5327697d46a6576b8bacfcb1a1f2352f5
parent bc350db984669fb4220e75b67407e0bec3e51038

Merge "[KA09] add keepalive offload permission to shell"
am: bc350db984

Change-Id: Ica5b5ec05731a7c840d1f7dd1534d532c524df04

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 9decd08..d44f5a9 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -262,6 +262,8 @@
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
         <permission name="android.permission.MOVE_PACKAGE"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS" />
+        <!-- Needed for test only -->
+        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />
         <permission name="android.permission.READ_FRAME_BUFFER"/>
         <permission name="android.permission.READ_LOWPAN_CREDENTIAL"/>
         <!-- Needed for test only -->

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 2687c68..8778e30 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -161,6 +161,8 @@
 
     <!-- Permission needed to run network tests in CTS -->
     <uses-permission android:name="android.permission.MANAGE_TEST_NETWORKS" />
+    <!-- Permission needed to test tcp keepalive offload. -->
+    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />
 
     <application android:label="@string/app_label"
                  android:defaultToDeviceProtectedStorage="true"