Verified Commit 8b67442c authored by Arturo Mejia's avatar Arturo Mejia Committed by Pier Angelo Vendrame
Browse files

For #21102: Build with SDK for Android 12 / API 31 (#25494) 



Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent e1146f6e

app/src/main/AndroidManifest.xml

+10 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
        -->

        <activity-alias

            android:name="${applicationId}.App"

            android:exported="true"

            android:targetActivity=".HomeActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -68,6 +69,7 @@ 
        <!-- Activity alias from Fennec used by PWA launchers on the home screen -->

        <activity-alias

            android:name="org.mozilla.gecko.LauncherActivity"

            android:exported="true"

            android:targetActivity=".IntentReceiverActivity">

            <intent-filter>

                <action android:name="org.mozilla.gecko.WEBAPP" />
@@ -76,6 +78,7 @@ 


        <activity

            android:name=".HomeActivity"

            android:exported="true"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|layoutDirection|smallestScreenSize|screenLayout"

            android:launchMode="singleTask"

            android:resizeableActivity="true"
@@ -265,6 +268,7 @@ 


        <service

            android:name=".autofill.AutofillService"

            android:exported="true"

            android:label="@string/app_name"

            android:permission="android.permission.BIND_AUTOFILL_SERVICE">

            <intent-filter>
@@ -288,9 +292,13 @@ 
            </intent-filter>

        </service>



        <service android:name=".downloads.DownloadService" />

        <service

            android:name=".downloads.DownloadService"

            android:exported="false" />



        <receiver

            android:name="org.mozilla.gecko.search.SearchWidgetProvider">

            android:name="org.mozilla.gecko.search.SearchWidgetProvider"

            android:exported="true">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>

app/src/nightly/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 


    <application>



        <service android:name=".customtabs.CustomTabsService">

        <service

            android:name=".customtabs.CustomTabsService"

            android:exported="true">

        <!-- Trusted Web Activities are currently only supported in nightly. -->

            <intent-filter tools:node="removeAll" />

            <intent-filter>

buildSrc/src/main/java/Config.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ object Config { 
    // Synchronized build configuration for all modules

    const val compileSdkVersion = 31

    const val minSdkVersion = 21

    const val targetSdkVersion = 30

    const val targetSdkVersion = 31



    @JvmStatic

    private fun generateDebugVersionName(): String {