| commit | 858b76e7ed09ba5a7ade642640ce430f65db6fe5 | [log] [tgz] |
|---|---|---|
| author | Vinay Joglekar <vinayjoglekar@google.com> | Thu Aug 29 10:58:10 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 29 10:58:10 2024 +0000 |
| tree | ed023602e88b521a55c9389f88a25c14bffe8c30 | |
| parent | a587ea691e67db2159d75904a578253f08f0d1e4 [diff] | |
| parent | c41fb6baf3a5270da892672833e4dfc664d93b8a [diff] |
Merge "(1/2) Fix NPE for title description broken by ag/28991306. It can be nullable initially before its set." into main
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt index 731b008..0ab36c9 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt
@@ -257,7 +257,7 @@ task: Task, appUsageLimitTimeMs: Long, appRemainingTimeMs: Long - ): String = + ): String? = if (appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0) container .asContext()