summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2019-02-08 15:26:06 +0900
committer Remi NGUYEN VAN <reminv@google.com> 2019-02-08 15:32:21 +0900
commit8c0d94608c7e332432b64ef3a1ad62a84472a0ee (patch)
tree1885425f3733d21af07f38c36d92c6bd361669ca
parent9c5d96490279dbc5cea09cf8a2da29318b397729 (diff)
Rename NetworkStack package
Set the new name to com.android.networkstack. Also rename the stub APK to com.android.networkstack.permissionstub. Also add shared UID to the NetworkStackPermissionStub to enforce signature restrictions on the UID. Test: booted, WiFi working Bug: 124033493 Change-Id: Id8967db08b7faaa659b20f86f1013493eb0e188f
-rw-r--r--data/etc/privapp-permissions-platform.xml2
-rw-r--r--packages/NetworkStack/AndroidManifest.xml2
-rw-r--r--packages/NetworkStackPermissionStub/AndroidManifest.xml3
3 files changed, 4 insertions, 3 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 9a148e4e7b79..3723ee2ebf57 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -199,7 +199,7 @@ applications that come with the platform
<permission name="android.permission.USE_RESERVED_DISK"/>
</privapp-permissions>
- <privapp-permissions package="com.android.mainline.networkstack">
+ <privapp-permissions package="com.android.networkstack">
<permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
<permission name="android.permission.CHANGE_BACKGROUND_DATA_SETTING"/>
<permission name="android.permission.CONNECTIVITY_INTERNAL"/>
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml
index ac55bfa1aed7..11a01ed680f6 100644
--- a/packages/NetworkStack/AndroidManifest.xml
+++ b/packages/NetworkStack/AndroidManifest.xml
@@ -17,7 +17,7 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.mainline.networkstack"
+ package="com.android.networkstack"
android:sharedUserId="android.uid.networkstack">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/packages/NetworkStackPermissionStub/AndroidManifest.xml b/packages/NetworkStackPermissionStub/AndroidManifest.xml
index 2ccf5ff1a01a..a8742d7ab34f 100644
--- a/packages/NetworkStackPermissionStub/AndroidManifest.xml
+++ b/packages/NetworkStackPermissionStub/AndroidManifest.xml
@@ -17,7 +17,8 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.mainline.networkstack.permissionstub">
+ package="com.android.networkstack.permissionstub"
+ android:sharedUserId="android.uid.networkstack">
<!--
This package only exists to define the below permissions, and enforce that they are only
granted to apps sharing the same signature.