Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Preventing NPE crash if view is detached from window." into tm-dev am: 76386f47a4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799295

Change-Id: I134b98555059d3e17b75797b9172bcd172d90671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-06-10 01:44:23 +00:00
committed by Automerger Merge Worker
parent a95ab05e3a 76386f47a4
commit 3d4a598a0c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/DisplayCutoutBaseView.kt
View File

@@ -87,20 +87,21 @@ open class DisplayCutoutBaseView : View, RegionInterceptableView {
fun onDisplayChanged(displayId: Int) {
val oldMode: Display.Mode? = displayMode
displayMode = display.mode
val display: Display? = context.display
displayMode = display?.mode
if (displayUniqueId != context.display?.uniqueId) {
displayUniqueId = context.display?.uniqueId
if (displayUniqueId != display?.uniqueId) {
displayUniqueId = display?.uniqueId
shouldDrawCutout = DisplayCutout.getFillBuiltInDisplayCutout(
context.resources, displayUniqueId)
}
// Skip if display mode or cutout hasn't changed.
if (!displayModeChanged(oldMode, displayMode) &&
display.cutout == displayInfo.displayCutout) {
display?.cutout == displayInfo.displayCutout) {
return
}
if (displayId == display.displayId) {
if (displayId == display?.displayId) {
updateCutout()
updateProtectionBoundingPath()
onUpdate()