commit | 95e3e450a199088cd0a086c3cea69bc18df69c4c | [log] [tgz] |
---|---|---|
author | Karsten Tausche <karsten@fairphone.com> | Wed Mar 15 20:00:03 2023 +0100 |
committer | Karsten Tausche <karsten@fairphone.com> | Wed Mar 15 20:00:03 2023 +0100 |
tree | 12314d73878bd018f3edaa02a0e406fbe4a1be11 | |
parent | d4459d4f52a09b283d17e084f8307dd9bc68aa25 [diff] | |
parent | a34fb1df1877d189c6d7351144cc7bbe07640535 [diff] |
Merge tag 'android-13.0.0_r32' into int/13/fp3 Android 13.0.0 release 32 * tag 'android-13.0.0_r32': Fix for: error: 'when' expression must be exhaustive, add necessary 'null' branch or 'else' branch instead Change-Id: If4accd9d6617252621c009344b99a5bb35f48ae5
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.kt b/src/com/android/deskclock/alarms/AlarmActivity.kt index a4caf1a..8d9535d 100644 --- a/src/com/android/deskclock/alarms/AlarmActivity.kt +++ b/src/com/android/deskclock/alarms/AlarmActivity.kt
@@ -283,6 +283,7 @@ } AlarmVolumeButtonBehavior.NOTHING -> { } + null -> { } } } }
diff --git a/src/com/android/deskclock/timer/TimerItem.kt b/src/com/android/deskclock/timer/TimerItem.kt index 9cdcca4..a0573cf 100644 --- a/src/com/android/deskclock/timer/TimerItem.kt +++ b/src/com/android/deskclock/timer/TimerItem.kt
@@ -138,6 +138,7 @@ mTimerText.isActivated = true mTimerText.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO } + null -> { } } } }