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

Merge "Rename NetworkStack package"

Browse Source 
am: e4a40c77e1

Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d
This commit is contained in:
Remi NGUYEN VAN
2019-02-17 17:15:47 -08:00
committed by android-build-merger
parent cb47305222 e4a40c77e1
commit 69728afbc7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/privapp-permissions-platform.xml
View File

@@ -200,7 +200,7 @@ applications that come with the platform
<permission name="android.permission.USE_RESERVED_DISK"/> <permission name="android.permission.USE_RESERVED_DISK"/>
</privapp-permissions> </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.ACCESS_NETWORK_CONDITIONS"/>
<permission name="android.permission.CONNECTIVITY_INTERNAL"/> <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
<permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/> <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>

2
packages/NetworkStack/AndroidManifest.xml
View File

@@ -17,7 +17,7 @@
*/ */
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.mainline.networkstack" package="com.android.networkstack"
android:sharedUserId="android.uid.networkstack"> android:sharedUserId="android.uid.networkstack">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

3
packages/NetworkStackPermissionStub/AndroidManifest.xml
View File

@@ -17,7 +17,8 @@
*/ */
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <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 This package only exists to define the below permissions, and enforce that they are only
granted to apps sharing the same signature. granted to apps sharing the same signature.