fix: prevent rear display crash when hide display cutout is enabled (#1534)

Author: zilewang7

library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/rules/systemframework/display/DisplayCutout.kt

@@ -19,16 +19,51 @@
 package com.sevtinge.hyperceiler.libhook.rules.systemframework.display
 
 import com.sevtinge.hyperceiler.libhook.base.BaseHook
+import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.getStaticObjectField
 import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.hookAllMethods
+import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.hookMethod
+import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.getObjectField
+import com.sevtinge.hyperceiler.libhook.utils.hookapi.tool.setObjectField
 
 object DisplayCutout : BaseHook() {
     override fun init() {
-        findClass("android.view.DisplayCutout")
+        val displayCutoutClass = findClass("android.view.DisplayCutout")
+        val noCutout = displayCutoutClass.getStaticObjectField("NO_CUTOUT")
+
+        displayCutoutClass
             .hookAllMethods("pathAndDisplayCutoutFromSpec") {
                 before {
                     it.args[0] = "M 0,0 H 0 V 0 Z"
-                    it.args[1] = ""
+                    // Android 16 prioritizes rectSpec when it is present.
+                    // An empty string causes the framework to return NULL_PAIR,
+                    // which propagates a null DisplayCutout to secondary displays.
+                    // Use null so the synthetic empty pathSpec remains effective.
+                    it.args[1] = null
+                }
+            }
+
+        listOf("fromResourcesRectApproximation", "fromSpec").forEach { methodName ->
+            displayCutoutClass.hookAllMethods(methodName) {
+                after {
+                    if (it.result == null) {
+                        it.result = noCutout
+                    }
                 }
             }
+        }
+
+        val logicalDisplayClass = findClass("com.android.server.display.LogicalDisplay")
+        logicalDisplayClass.hookMethod("getDisplayInfoLocked") {
+            after {
+                ensureNonNullDisplayCutout(it.result, noCutout)
+            }
+        }
+    }
+
+    private fun ensureNonNullDisplayCutout(displayInfo: Any?, noCutout: Any?) {
+        if (displayInfo == null || noCutout == null) return
+        if (displayInfo.getObjectField("displayCutout") == null) {
+            displayInfo.setObjectField("displayCutout", noCutout)
+        }
     }
 }