commit | 754beffad490c5fc6d5db31d127cd72c498735fd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 15 22:33:53 2022 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 15 22:33:53 2022 +0000 |
tree | a57a9081b830c51480370d70c82be9bcfeae7348 | |
parent | fbde51b84d8c73a067c50cdafa6dd57c27da300b [diff] | |
parent | 2d796a4ee72adf6d2016f7650c50b8eb6ec0c8e7 [diff] |
Merge "Fix for: error: 'when' expression must be exhaustive, add necessary 'null' branch or 'else' branch instead"
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.kt b/src/com/android/deskclock/alarms/AlarmActivity.kt index 4061fc6..07a54d2 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 -> { } } } }