From 3a2dfc0d7fa7766c434c7a6a1e383f4a7c1f865f Mon Sep 17 00:00:00 2001 From: Michael Stillwell Date: Wed, 4 Oct 2023 00:27:16 +0100 Subject: [PATCH] Update targetSdk to 33 (#918) Some failing tests (round*), but seems they always fail? --- AlwaysOnKotlin/compose/build.gradle | 2 +- .../compose/src/main/AndroidManifest.xml | 1 - .../wearable/wear/alwayson/AlwaysOnApp.kt | 25 +++++++++++++++---- AlwaysOnKotlin/views/build.gradle | 2 +- .../wearable/wear/alwayson/MainActivity.kt | 17 +++++++++---- ComposeAdvanced/benchmark/build.gradle | 2 +- DataLayer/Application/build.gradle | 4 +-- DataLayer/Wearable/build.gradle | 4 +-- RuntimePermissionsWear/Wearable/build.gradle | 4 +-- .../Wearable/src/main/AndroidManifest.xml | 1 + WatchFaceKotlin/app/build.gradle | 2 +- WearStandaloneGoogleSignIn/app/build.gradle | 2 +- WearVerifyRemoteApp/Application/build.gradle | 2 +- WearVerifyRemoteApp/Wearable/build.gradle | 2 +- 14 files changed, 46 insertions(+), 24 deletions(-) diff --git a/AlwaysOnKotlin/compose/build.gradle b/AlwaysOnKotlin/compose/build.gradle index 55761e753..63a63da58 100644 --- 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 index f7e120927..d183e0e23 100644 --- a/AlwaysOnKotlin/compose/src/main/AndroidManifest.xml +++ b/AlwaysOnKotlin/compose/src/main/AndroidManifest.xml @@ -23,7 +23,6 @@ diff --git a/AlwaysOnKotlin/compose/src/main/java/com/example/android/wearable/wear/alwayson/AlwaysOnApp.kt b/AlwaysOnKotlin/compose/src/main/java/com/example/android/wearable/wear/alwayson/AlwaysOnApp.kt index 4a18c30ef..e922be4ed 100644 --- a/AlwaysOnKotlin/compose/src/main/java/com/example/android/wearable/wear/alwayson/AlwaysOnApp.kt +++ b/AlwaysOnKotlin/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 index 0838cfdf0..7430f569e 100644 --- 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/AlwaysOnKotlin/views/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.kt b/AlwaysOnKotlin/views/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.kt index 9b6d63fe6..70dbd7ddc 100644 --- a/AlwaysOnKotlin/views/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.kt +++ b/AlwaysOnKotlin/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 index 660d71ae1..95f039142 100644 --- 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 index 90f748ba3..678e36967 100644 --- 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 index f84cb762d..69098ef4a 100644 --- 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 index 4458a9c6d..b1011cb31 100644 --- 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 index 8ac4b005d..8fea0e0d0 100644 --- 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" > diff --git a/WatchFaceKotlin/app/build.gradle b/WatchFaceKotlin/app/build.gradle index 8cc5554a2..02c819609 100644 --- 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 index 13651e252..3b4dc5581 100644 --- 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 index 7dab669af..bb82f6bdc 100644 --- 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 index 84b64808c..97796fbd5 100644 --- 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 {