diff options
author | Chris Warrington <cmw@google.com> | 2021-12-21 14:57:39 +0000 |
---|---|---|
committer | Chris Warrington <cmw@google.com> | 2021-12-21 16:12:34 +0000 |
commit | b75a7a735606be36feda1f35a7eb03813764e29a (patch) | |
tree | 6eebf7aea213fa3792fd77a2eed0ee9d0afceaa7 | |
parent | 817e67986b28db4295956fa62fb8748c86014609 (diff) | |
download | data-binding-b75a7a735606be36feda1f35a7eb03813764e29a.tar.gz |
Re-enable data binding tests
See I95afd1a219cde950e67e34e09d28fcc2e4af44ff
Update the test projects to add android:exported to activities with
declared intent filters, as the manifest merger enforces that activities
with intent filters explicitly specify android:exported for apps that
target SDK 31 or higher, as apps will fail to install without it.
Bug: 203802678
Test: Reenabled in I95afd1a219cde950e67e34e09d28fcc2e4af44ff
Change-Id: I676e72ba1e3c4b7dac5ee755fe8736db3ca70fc9
18 files changed, 25 insertions, 15 deletions
diff --git a/integration-tests-support/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml b/integration-tests-support/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml index 98e9a681..2e106719 100644 --- a/integration-tests-support/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml +++ b/integration-tests-support/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name=".MainActivity"> + <activity android:name=".MainActivity" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> @@ -33,4 +33,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml b/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml index f9ba1195..d91a6777 100644 --- a/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml +++ b/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ </dist:module> <application> - <activity android:name=".FeatureAActivity"> + <activity android:name=".FeatureAActivity" android:exported="true"> <intent-filter android:order="1"> <action android:name="android.intent.action.VIEW"/> diff --git a/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml b/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml index 04372891..08a6a7ae 100644 --- a/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml +++ b/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ </dist:module> <application> - <activity android:name=".MainBActivity"> + <activity android:name=".MainBActivity" android:exported="true"> <intent-filter android:order="1"> <action android:name="android.intent.action.VIEW"/> diff --git a/integration-tests-support/MultiModuleTestApp/app/src/main/AndroidManifest.xml b/integration-tests-support/MultiModuleTestApp/app/src/main/AndroidManifest.xml index 7e1cb9b9..c336990c 100644 --- a/integration-tests-support/MultiModuleTestApp/app/src/main/AndroidManifest.xml +++ b/integration-tests-support/MultiModuleTestApp/app/src/main/AndroidManifest.xml @@ -25,6 +25,7 @@ android:theme="@style/AppTheme" > <activity android:name=".MainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests-support/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml b/integration-tests-support/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml index 446b2a03..999f8fbf 100644 --- a/integration-tests-support/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml +++ b/integration-tests-support/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml @@ -24,6 +24,7 @@ android:label="@string/app_name" > <activity android:name=".TestLibraryMainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests-support/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml b/integration-tests-support/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml index aabb9afb..51807be7 100644 --- a/integration-tests-support/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml +++ b/integration-tests-support/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml @@ -24,6 +24,7 @@ android:label="@string/app_name" > <activity android:name=".TestLibraryMainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests-support/ProguardedAppWithTest/app/src/main/AndroidManifest.xml b/integration-tests-support/ProguardedAppWithTest/app/src/main/AndroidManifest.xml index f3b39fc7..c021e4ab 100644 --- a/integration-tests-support/ProguardedAppWithTest/app/src/main/AndroidManifest.xml +++ b/integration-tests-support/ProguardedAppWithTest/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name=".MainActivity"> + <activity android:name=".MainActivity" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> @@ -17,4 +17,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/integration-tests/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml b/integration-tests/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml index 36c347f1..ca0b0167 100644 --- a/integration-tests/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml +++ b/integration-tests/AppWithDataBindingInTests/app/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name=".MainActivity"> + <activity android:name=".MainActivity" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> diff --git a/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml b/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml index f9ba1195..d91a6777 100644 --- a/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml +++ b/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ </dist:module> <application> - <activity android:name=".FeatureAActivity"> + <activity android:name=".FeatureAActivity" android:exported="true"> <intent-filter android:order="1"> <action android:name="android.intent.action.VIEW"/> diff --git a/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml b/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml index 04372891..08a6a7ae 100644 --- a/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml +++ b/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ </dist:module> <application> - <activity android:name=".MainBActivity"> + <activity android:name=".MainBActivity" android:exported="true"> <intent-filter android:order="1"> <action android:name="android.intent.action.VIEW"/> diff --git a/integration-tests/KotlinTestApp/app/build.gradle b/integration-tests/KotlinTestApp/app/build.gradle index 62300164..8b99cf4b 100644 --- a/integration-tests/KotlinTestApp/app/build.gradle +++ b/integration-tests/KotlinTestApp/app/build.gradle @@ -44,7 +44,7 @@ android { dependencies { def supportVersion = "1.2.0" def lifecycleVersion = "2.2.0" - def testingVersion = "1.1.0" + def testingVersion = "1.3.0" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(":library1") implementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.kotlinVersion" diff --git a/integration-tests/KotlinTestApp/app/src/main/AndroidManifest.xml b/integration-tests/KotlinTestApp/app/src/main/AndroidManifest.xml index 3eaa3208..20f4b77f 100644 --- a/integration-tests/KotlinTestApp/app/src/main/AndroidManifest.xml +++ b/integration-tests/KotlinTestApp/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ tools:ignore="GoogleAppIndexingWarning"> <activity android:name=".TestActivity" + android:exported="true" android:label="@string/title_activity_test_activty" android:theme="@style/AppTheme.NoActionBar"> <intent-filter> diff --git a/integration-tests/MultiModuleTestApp/app/src/main/AndroidManifest.xml b/integration-tests/MultiModuleTestApp/app/src/main/AndroidManifest.xml index 27dabdcc..9720c184 100644 --- a/integration-tests/MultiModuleTestApp/app/src/main/AndroidManifest.xml +++ b/integration-tests/MultiModuleTestApp/app/src/main/AndroidManifest.xml @@ -25,6 +25,7 @@ android:theme="@style/AppTheme" > <activity android:name=".MainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml b/integration-tests/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml index e9a5ad34..ca6ef65c 100644 --- a/integration-tests/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml +++ b/integration-tests/MultiModuleTestApp/testlibrary1/src/main/AndroidManifest.xml @@ -24,6 +24,7 @@ android:label="@string/app_name" > <activity android:name=".TestLibraryMainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml b/integration-tests/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml index 9abff935..7c246f2a 100644 --- a/integration-tests/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml +++ b/integration-tests/MultiModuleTestApp/testlibrary2/src/main/AndroidManifest.xml @@ -24,6 +24,7 @@ android:label="@string/app_name" > <activity android:name=".TestLibraryMainActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/integration-tests/ProguardedAppWithTest/app/src/main/AndroidManifest.xml b/integration-tests/ProguardedAppWithTest/app/src/main/AndroidManifest.xml index a2e85175..3e99dec3 100644 --- a/integration-tests/ProguardedAppWithTest/app/src/main/AndroidManifest.xml +++ b/integration-tests/ProguardedAppWithTest/app/src/main/AndroidManifest.xml @@ -8,7 +8,9 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name="com.example.android.proguardedappwithtest.MainActivity"> + <activity + android:name="com.example.android.proguardedappwithtest.MainActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> @@ -17,4 +19,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle index 4fdaeed2..588d2cef 100644 --- a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle +++ b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle @@ -44,7 +44,7 @@ android { dependencies { def supportVersion = "1.0.0" def lifecycleVersion = "2.2.0" - def testingVersion = "1.1.0" + def testingVersion = "1.3.0" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.kotlinVersion" implementation "androidx.lifecycle:lifecycle-runtime:$lifecycleVersion" diff --git a/integration-tests/ViewBindingWithDataBindingTestApp/app/src/main/AndroidManifest.xml b/integration-tests/ViewBindingWithDataBindingTestApp/app/src/main/AndroidManifest.xml index 12ad3a24..9e5babd9 100644 --- a/integration-tests/ViewBindingWithDataBindingTestApp/app/src/main/AndroidManifest.xml +++ b/integration-tests/ViewBindingWithDataBindingTestApp/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/Theme.AppCompat.Light.DarkActionBar" tools:ignore="GoogleAppIndexingWarning"> <activity - android:name=".TestActivity"> + android:name=".TestActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -33,4 +34,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> |