Merge pull request #194 from android/fix-ultrahdr-sample

seventhmoon · web-flow · commit 06f16c82f4b1 · 2024-09-05T22:45:58.000+08:00
Fix failing Ultra HDR sample on emulator
diff --git a/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt b/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt
@@ -182,8 +182,11 @@ class UltraHDRWithOpenGL : Fragment(),
     }
 
     override fun onAttach(context: Context) {
-        requireActivity().display
-            ?.registerHdrSdrRatioChangedListener(Runnable::run, updateHdrSdrRatio)
+        requireActivity().display?.let { display ->
+            if (display.isHdrSdrRatioAvailable) {
+                display.registerHdrSdrRatioChangedListener(Runnable::run, updateHdrSdrRatio)
+            }
+        }
         super.onAttach(context)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,11 @@ class UltraHDRWithOpenGL : Fragment(),`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`override fun onAttach(context: Context) {`
`185`		`- requireActivity().display`
`186`		`- ?.registerHdrSdrRatioChangedListener(Runnable::run, updateHdrSdrRatio)`
	`185`	`+ requireActivity().display?.let { display ->`
	`186`	`+ if (display.isHdrSdrRatioAvailable) {`
	`187`	`+ display.registerHdrSdrRatioChangedListener(Runnable::run, updateHdrSdrRatio)`
	`188`	`+ }`
	`189`	`+ }`
`187`	`190`	`super.onAttach(context)`
`188`	`191`	`}`
`189`	`192`