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

Merge "Sign networkstack with its own certificate"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-02-16 01:48:49 +00:00
committed by Gerrit Code Review
parent 3f23efdd13 ab96bc758e
commit fd2d7dc685
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CaptivePortalLogin/Android.bp
View File

@@ -18,7 +18,7 @@ android_app {
name: "CaptivePortalLogin", name: "CaptivePortalLogin",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
sdk_version: "system_current", sdk_version: "system_current",
certificate: "platform", certificate: "networkstack",
static_libs: [ static_libs: [
"android-support-v4", "android-support-v4",
"metrics-constants-protos", "metrics-constants-protos",

2
packages/CaptivePortalLogin/AndroidManifest.xml
View File

@@ -23,8 +23,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" /> <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" />
<uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"

2
packages/NetworkStack/Android.bp
View File

@@ -35,7 +35,7 @@ java_library {
android_app { android_app {
name: "NetworkStack", name: "NetworkStack",
sdk_version: "system_current", sdk_version: "system_current",
certificate: "platform", certificate: "networkstack",
privileged: true, privileged: true,
static_libs: [ static_libs: [
"NetworkStackLib" "NetworkStackLib"

2
packages/NetworkStack/AndroidManifest.xml
View File

@@ -24,12 +24,10 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<!-- Signature permission defined in NetworkStackStub --> <!-- Signature permission defined in NetworkStackStub -->
<uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />
<!-- Send latency broadcast as current user --> <!-- Send latency broadcast as current user -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <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.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<application <application

2
packages/NetworkStackPermissionStub/Android.bp
View File

@@ -21,7 +21,7 @@ android_app {
// a classes.dex. // a classes.dex.
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
platform_apis: true, platform_apis: true,
certificate: "platform", certificate: "networkstack",
privileged: true, privileged: true,
manifest: "AndroidManifest.xml", manifest: "AndroidManifest.xml",
} }