Update targetSdk to 33 (#918)

Some failing tests (round*), but seems they always fail?
android · Oct 3, 2023 · 3a2dfc0 · 3a2dfc0
1 parent fbb5d8d
commit 3a2dfc0
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 24 deletions.
diff --git a/AlwaysOnKotlin/compose/build.gradle b/AlwaysOnKotlin/compose/build.gradle
@@ -29,7 +29,7 @@ android {
         versionName "1.0"
         minSdk 26
         //noinspection ExpiredTargetSdkVersion
-        targetSdk 30
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/AlwaysOnKotlin/compose/src/main/AndroidManifest.xml b/AlwaysOnKotlin/compose/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
     <uses-feature android:name="android.hardware.type.watch" />
 
     <application
-        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.DeviceDefault">

diff --git a/...sOnKotlin/compose/src/main/java/com/example/android/wearable/wear/alwayson/AlwaysOnApp.kt b/...sOnKotlin/compose/src/main/java/com/example/android/wearable/wear/alwayson/AlwaysOnApp.kt
@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -63,6 +64,8 @@ val AMBIENT_INTERVAL: Duration = Duration.ofSeconds(10)
 
 const val AMBIENT_UPDATE_ACTION = "com.example.android.wearable.wear.alwayson.action.AMBIENT_UPDATE"
 
+const val TAG = "AlwaysOnApp"
+
 /**
  * Create a PendingIntent which we'll give to the AlarmManager to send ambient mode updates
  * on an interval which we've define.
@@ -157,6 +160,7 @@ fun AlwaysOnApp(
                     }
                 }
             }
+
             AmbientState.Interactive -> Unit
         }
 
@@ -173,12 +177,23 @@ fun AlwaysOnApp(
                     val triggerTime = currentInstant.getNextInstantWithInterval(
                         AMBIENT_INTERVAL
                     )
-                    ambientUpdateAlarmManager.setExact(
-                        AlarmManager.RTC_WAKEUP,
-                        triggerTime.toEpochMilli(),
-                        ambientUpdatePendingIntent
-                    )
+                    try {
+                        ambientUpdateAlarmManager.setExact(
+                            AlarmManager.RTC_WAKEUP,
+                            triggerTime.toEpochMilli(),
+                            ambientUpdatePendingIntent
+                        )
+                    } catch (_: SecurityException) {
+                        Log.d(
+                            TAG,
+                            arrayOf(
+                                "SecurityException when calling setExact(),",
+                                "screen will not be refreshed"
+                            ).joinToString(" ")
+                        )
+                    }
                 }
+
                 AmbientState.Interactive -> {
                     val delay = currentInstant.getDelayToNextInstantWithInterval(
                         ACTIVE_INTERVAL

diff --git a/AlwaysOnKotlin/views/build.gradle b/AlwaysOnKotlin/views/build.gradle
@@ -28,7 +28,7 @@ android {
         versionCode 1
         versionName "1.0"
         minSdk 26
-        targetSdk 30
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...ysOnKotlin/views/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.kt b/...ysOnKotlin/views/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.kt
@@ -194,11 +194,18 @@ class MainActivity : FragmentActivity() {
         if (ambientCallbackState.isAmbient) {
             val triggerTime = instant.getNextInstantWithInterval(AMBIENT_INTERVAL)
             if (Build.VERSION.SDK_INT < 33) {
-                ambientUpdateAlarmManager.setExact(
-                    AlarmManager.RTC_WAKEUP,
-                    triggerTime.toEpochMilli(),
-                    ambientUpdatePendingIntent
-                )
+                try {
+                    ambientUpdateAlarmManager.setExact(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime.toEpochMilli(),
+                        ambientUpdatePendingIntent
+                    )
+                } catch (_: SecurityException) {
+                    Log.d(
+                        TAG,
+                        "SecurityException when calling setExact(), screen will not be refreshed"
+                    )
+                }
             }
         } else {
             Log.d(TAG, "!isAmbient")

diff --git a/ComposeAdvanced/benchmark/build.gradle b/ComposeAdvanced/benchmark/build.gradle
@@ -18,7 +18,7 @@ android {
 
     defaultConfig {
         minSdk 29
-        targetSdk 30
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/DataLayer/Application/build.gradle b/DataLayer/Application/build.gradle
@@ -20,7 +20,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
 
     namespace "com.example.android.wearable.datalayer"
 
@@ -30,7 +30,7 @@ android {
         versionCode 1
         versionName "1.0"
         minSdk 21
-        targetSdk 32
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/DataLayer/Wearable/build.gradle b/DataLayer/Wearable/build.gradle
@@ -20,7 +20,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
 
     namespace "com.example.android.wearable.datalayer"
 
@@ -30,7 +30,7 @@ android {
         versionName "1.0"
 
         minSdk 26
-        targetSdk 30
+        targetSdk 33
     }
 
     lintOptions {

diff --git a/RuntimePermissionsWear/Wearable/build.gradle b/RuntimePermissionsWear/Wearable/build.gradle
@@ -20,7 +20,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
 
     namespace "com.example.android.wearable.runtimepermissions"
 
@@ -30,7 +30,7 @@ android {
         versionCode 1
         versionName "1.0"
         minSdkVersion 26
-        targetSdk 30
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml b/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
             android:name=".MainWearActivity"
             android:launchMode="singleInstance"
             android:taskAffinity=".main"
+            android:exported="true"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/WatchFaceKotlin/app/build.gradle b/WatchFaceKotlin/app/build.gradle
@@ -27,7 +27,7 @@ android {
     defaultConfig {
         applicationId "com.example.android.wearable.alpha"
         minSdk 28
-        targetSdk 30
+        targetSdk 33
         versionCode 1
         versionName "1.0"
     }

diff --git a/WearStandaloneGoogleSignIn/app/build.gradle b/WearStandaloneGoogleSignIn/app/build.gradle
@@ -30,7 +30,7 @@ android {
         versionName "1.0"
 
         minSdk 26
-        targetSdk 30
+        targetSdk 33
     }
 
     lintOptions {

diff --git a/WearVerifyRemoteApp/Application/build.gradle b/WearVerifyRemoteApp/Application/build.gradle
@@ -28,7 +28,7 @@ android {
         versionCode 1
         versionName "1.0"
         minSdk 23
-        targetSdk 32
+        targetSdk 33
     }
 
     compileOptions {

diff --git a/WearVerifyRemoteApp/Wearable/build.gradle b/WearVerifyRemoteApp/Wearable/build.gradle
@@ -28,7 +28,7 @@ android {
         versionCode 1
         versionName "1.0"
         minSdk 26
-        targetSdk 30
+        targetSdk 33
     }
 
     compileOptions {