summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-02-16 01:48:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-02-16 01:48:49 +0000
commit0aceb93c918dcc3a3da49338181fddb00774badc (patch)
tree1a35ec8cc9ebe587c5b21295723b2fa9cd8728cf
parentf0c2de7466ead37a24f2cf34c760489cdb75b17c (diff)
parentd8327a2a693763b05ba99df7032413d8487e2649 (diff)
Merge "Sign networkstack with its own certificate"
-rw-r--r--Android.bp2
-rw-r--r--AndroidManifest.xml2
2 files changed, 1 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 855d5dd..b700bf3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,7 +35,7 @@ java_library {
android_app {
name: "NetworkStack",
sdk_version: "system_current",
- certificate: "platform",
+ certificate: "networkstack",
privileged: true,
static_libs: [
"NetworkStackLib"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 860ebfb..0476712 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,12 +24,10 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<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" />
<!-- Send latency broadcast as current user -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.NETWORK_STACK" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<application