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

Add an exported flag in integration tests manifest

Browse Source 
(partial cherry-pick of internal change:
I4457ff2bd466a4c56fed2570e110f251031c2385)

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Merged-In: I4457ff2bd466a4c56fed2570e110f251031c2385
Change-Id: I65a1ca1678048bbf09edc9a0485b673644c8109d
This commit is contained in:
Remi NGUYEN VAN
2020-05-19 17:49:36 +09:00
parent 1894a79964
commit d68de90e40
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,50 +16,53 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.net.integrationtests"> package="com.android.server.net.integrationtests">
<!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) --> <!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
<!-- PermissionMonitor sets network permissions for each user --> <!-- PermissionMonitor sets network permissions for each user -->
<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 --> <!-- Reading network status -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.NETWORK_FACTORY" /> <uses-permission android:name="android.permission.NETWORK_FACTORY"/>
<uses-permission android:name="android.permission.NETWORK_STACK" /> <uses-permission android:name="android.permission.NETWORK_STACK"/>
<uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" /> <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY"/>
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<!-- Reading DeviceConfig flags --> <!-- Reading DeviceConfig flags -->
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <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=".TestNetworkStackService" <service android:name=".TestNetworkStackService"
android:process="com.android.server.net.integrationtests.testnetworkstack"> android:process="com.android.server.net.integrationtests.testnetworkstack"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.net.INetworkStackConnector.Test"/> <action android:name="android.net.INetworkStackConnector.Test"/>
</intent-filter> </intent-filter>
</service> </service>
<service android:name=".NetworkStackInstrumentationService" <service android:name=".NetworkStackInstrumentationService"
android:process="com.android.server.net.integrationtests.testnetworkstack"> android:process="com.android.server.net.integrationtests.testnetworkstack"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name=".INetworkStackInstrumentation"/> <action android:name=".INetworkStackInstrumentation"/>
</intent-filter> </intent-filter>
</service> </service>
<service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" <service 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"/> android:permission="android.permission.BIND_JOB_SERVICE"/>
</application> </application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.server.net.integrationtests" android:targetPackage="com.android.server.net.integrationtests"
android:label="Frameworks Net Integration Tests" /> android:label="Frameworks Net Integration Tests"/>
</manifest> </manifest>