sdm845-common: Fix restoring default LiveDisplay mode

* Call DisplayModes::setDisplayMode(modeID, false) in the constructor * Move sysfs nodes chown/chmod to from 'on boot' to on init' so that they have proper perms right away. Change-Id: I51ee19136688f83703e85b76d5219e5a567bbaa3
sailfish-oneplus6 · Jun 17, 2019 · 702507f · 702507f
1 parent f0e0e81
commit 702507f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/livedisplay/DisplayModes.cpp b/livedisplay/DisplayModes.cpp
@@ -53,6 +53,8 @@ DisplayModes::DisplayModes() : mDefaultModeId(0) {
             break;
         }
     }
+
+    setDisplayMode(mDefaultModeId, false);
 }
 
 // Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow.

diff --git a/livedisplay/[email protected]_sdm845.rc b/livedisplay/[email protected]_sdm845.rc
@@ -1,12 +1,12 @@
-on post-fs-data
-    mkdir /data/misc/display 0770 system graphics
-
-on boot
+on init
     chmod 0660 /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/display_mode
     chmod 0660 /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/hbm
     chown system system /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/display_mode
     chown system system /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/hbm
 
+on post-fs-data
+    mkdir /data/misc/display 0770 system graphics
+
 service livedisplay-hal-2-0 /system/bin/hw/[email protected]_sdm845
     class hal
     user system
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,8 @@ DisplayModes::DisplayModes() : mDefaultModeId(0) { @@
                 break;
             }
         }
+        setDisplayMode(mDefaultModeId, false);
     }
     // Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow.
@@ Expand Down @@