commit da54a10704b390b6b986d395fc433ec6fc561a4a
author Remi NGUYEN VAN <reminv@google.com> Thu Jan 31 14:13:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 31 14:13:22 2019 +0000
tree 001c087a6d9b4d244ad6d9e5165c1dec581d87c7
parent 859a5d0f86a579e9af9296f6bd29419cdca0f499
parent d65832ec45955abfb2f49fb135f1569764f3b8c6

Merge "Add NetworkStackPermissionStub definitions"

Android.bp

diff --git a/Android.bp b/Android.bp
index b0522f2..d656593 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,4 +41,5 @@
         "NetworkStackLib"
     ],
     manifest: "AndroidManifest.xml",
+    required: ["NetworkStackPermissionStub"],
 }
\ No newline at end of file

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ab833b..ac55bfa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,8 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
     <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+    <!-- Signature permission defined in NetworkStackStub -->
+    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />
     <!-- Launch captive portal app as specific user -->
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.NETWORK_STACK" />