Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b15da9fb19

Change-Id: Ieab8acf24f294d758667230b5c07a6540419186d
This commit is contained in:
Mark Chien
2019-03-28 23:43:45 -07:00
committed by android-build-merger
parent 2cc1be3b5a b15da9fb19
commit 2be1be0426
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/privapp-permissions-platform.xml
View File

@@ -262,6 +262,8 @@ applications that come with the platform
<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 -->

2
packages/Shell/AndroidManifest.xml
View File

@@ -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"