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

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

@@ -16,6 +16,7 @@
* 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">
@@ -41,13 +42,15 @@
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>