summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-09-01 18:53:41 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-01 18:53:41 -0700
commit69f6356c397754a68ccb91639ce2c8df61db8f08 (patch)
tree8cca561d9fc2f0e591b7b14db04efef6ae397645
parent4b468434dd85eebbc5b571972d5a9e436abfbffb (diff)
parent967dd0a233581d9f2373cdfa2b2b74e31073302a (diff)
Merge "Add permission to NetworkStackService"
am: 967dd0a233 Change-Id: I858a3ad407c3ec14a69c6ff9c975de9e565d9c86
-rw-r--r--AndroidManifest.xml3
-rw-r--r--AndroidManifest_InProcess.xml4
2 files changed, 5 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 250feee..cace7e2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,8 @@
<application
android:extractNativeLibs="false"
android:persistent="true">
- <service android:name="com.android.server.NetworkStackService">
+ <service android:name="com.android.server.NetworkStackService"
+ android:permission="android.permission.MAINLINE_NETWORK_STACK">
<intent-filter>
<action android:name="android.net.INetworkStackConnector"/>
</intent-filter>
diff --git a/AndroidManifest_InProcess.xml b/AndroidManifest_InProcess.xml
index 2778a2a..723df09 100644
--- a/AndroidManifest_InProcess.xml
+++ b/AndroidManifest_InProcess.xml
@@ -22,7 +22,9 @@
android:process="system">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
<application>
- <service android:name="com.android.server.NetworkStackService" android:process="system">
+ <service android:name="com.android.server.NetworkStackService"
+ android:process="system"
+ android:permission="android.permission.MAINLINE_NETWORK_STACK">
<intent-filter>
<action android:name="android.net.INetworkStackConnector.InProcess"/>
</intent-filter>