LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add permissions to NetIntegrationTests manifest

Browse Source 
As the TestNetworkStack target is updated not to use the complete
NetworkStackManifest to avoid including priv-app permissions and actual
service names, the missing permissions must be added to the
FrameworksNetIntegrationTests manifest.

Add the permissions and attributes that are necessary for the test, and
used to be merged from the TestNetworkStack library manifest.

Test: atest FrameworksNetIntegrationTests
Change-Id: I8b434e67f3a6c9141da71c6dfab1be77aa0f8411
This commit is contained in:
Remi NGUYEN VAN
2019-10-30 18:30:03 +09:00
parent 68e38feeda
commit c598529450
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/net/integration/AndroidManifest.xml
View File

@@ -17,7 +17,6 @@
*/ */
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.android.server.net.integrationtests"> package="com.android.server.net.integrationtests">
<!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) --> <!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) -->
@@ -26,13 +25,19 @@
<uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.MANAGE_USERS" />
<!-- ConnectivityService sends notifications to BatteryStats --> <!-- ConnectivityService sends notifications to BatteryStats -->
<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" /> <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
<!-- Reading network status -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<!-- Reading DeviceConfig flags -->
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<application android:debuggable="true"> <application android:debuggable="true">
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
<!-- This manifest is merged with the base manifest of the real NetworkStack app. <!-- This manifest is merged with the base manifest of the real NetworkStack app.
Remove the NetworkStackService from the base (real) manifest, and replace with a test Remove the NetworkStackService from the base (real) manifest, and replace with a test
service that responds to the same intent --> service that responds to the same intent -->
<service android:name="com.android.server.NetworkStackService" tools:node="remove"/>
<service android:name=".TestNetworkStackService" <service android:name=".TestNetworkStackService"
android:process="com.android.server.net.integrationtests.testnetworkstack"> android:process="com.android.server.net.integrationtests.testnetworkstack">
<intent-filter> <intent-filter>
@@ -45,9 +50,9 @@
<action android:name=".INetworkStackInstrumentation"/> <action android:name=".INetworkStackInstrumentation"/>
</intent-filter> </intent-filter>
</service> </service>
<service tools:replace="android:process" <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" android:process="com.android.server.net.integrationtests.testnetworkstack"
android:process="com.android.server.net.integrationtests.testnetworkstack"/> android:permission="android.permission.BIND_JOB_SERVICE"/>
</application> </application>