[APT-10202] Target Android 14

Sets service permissions, exports relevant BroadcastReceivers, and changes build to use JDK version 17.
scribd · Jul 3, 2024 · 4da44c0 · 4da44c0
1 parent b024097
commit 4da44c0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/Armadillo/build.gradle b/Armadillo/build.gradle
@@ -18,16 +18,16 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName project.LIBRARY_VERSION
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -44,6 +44,9 @@ android {
     }
 
     resourcePrefix 'arm'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {

diff --git a/Armadillo/src/main/AndroidManifest.xml b/Armadillo/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
             android:exported="true"
             android:stopWithTask="false"
             android:foregroundServiceType="mediaPlayback"
+            android:permission="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"
             tools:ignore="ExportedService">
 
             <intent-filter>

diff --git a/Armadillo/src/main/java/com/scribd/armadillo/broadcast/ArmadilloNoisySpeakerReceiver.kt b/Armadillo/src/main/java/com/scribd/armadillo/broadcast/ArmadilloNoisySpeakerReceiver.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioManager
+import android.os.Build
 import android.util.Log
 
 /**
@@ -45,7 +46,12 @@ class ArmadilloNoisyReceiver(val application: Application)
         if(!isRegistered) {
             this.listener = listener
             Log.v(TAG, "registered for listening noisy")
-            application.registerReceiver(this, intentFilter)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                application.registerReceiver(this, intentFilter, Context.RECEIVER_EXPORTED)
+            } else {
+                application.registerReceiver(this, intentFilter)
+            }
             isRegistered = true
         }
     }

diff --git a/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt b/Armadillo/src/main/java/com/scribd/armadillo/broadcast/NotificationDeleteReceiver.kt
@@ -7,6 +7,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.Build
 import com.scribd.armadillo.hasSnowCone
 
 /**
@@ -33,7 +34,11 @@ internal class ArmadilloNotificationDeleteReceiver(val application: Application)
 
     override fun register(listener: NotificationDeleteReceiver.Listener) {
         if (!isRegistered) {
-            application.registerReceiver(this, IntentFilter(ACTION))
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                application.registerReceiver(this, IntentFilter(ACTION), Context.RECEIVER_NOT_EXPORTED)
+            } else {
+                application.registerReceiver(this, IntentFilter(ACTION))
+            }
             deleteListener = listener
             isRegistered = true
         }

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,8 @@
 # Project Armadillo Release Notes
 
+## 1.4.0
+- Targets Android 14 (SDK 34), with appropriate service permissions.
+
 ## 1.3.3
 - Reverted fix in 1.3.2 as it may have affected listening progress not being correctly reported
 - Added support for passing in load control parameters via ArmadilloConfiguration to the exo player instance

diff --git a/TestApp/src/main/AndroidManifest.xml b/TestApp/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="com.scribd.armadillotestapp">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <uses-feature
         android:name="android.hardware.type.automotive"
@@ -45,7 +46,8 @@
 
         <service
             android:name="com.scribd.armadillo.download.DefaultExoplayerDownloadService"
-            android:exported="false">
+            android:exported="false"
+            android:permission="android.permission.FOREGROUND_SERVICE">
             <intent-filter>
                 <action android:name="com.google.android.exoplayer.downloadService.action.INIT"/>
                 <category android:name="android.intent.category.DEFAULT"/>

diff --git a/gradle.properties b/gradle.properties
@@ -23,4 +23,5 @@ SERIALIZATON_VERSION=1.4.1
 # Update package-list when updating build tools version
 BUILD_TOOLS_VERSION=29.0.3
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.nonTransitiveRClass=true