From b7386052ed5ceacb899e22d8f479826cbc21a7b3 Mon Sep 17 00:00:00 2001
From: Tellen Yu<tellen.yu@amlogic.com>
Date: Tue, 07  Nov  2017  08:23:47  +0000
Subject: Merge "graphic: modify node permissions [3/3]" into o-amlogic

---
diff --git a/common/products/mbox/init.amlogic.ab.rc b/common/products/mbox/init.amlogic.ab.rc
index 0a6532e..1e0d469 100644
--- a/common/products/mbox/init.amlogic.ab.rc
+++ b/common/products/mbox/init.amlogic.ab.rc
@@ -101,7 +101,7 @@ on boot
     chown media system /sys/class/tsync/av_threshold_min
     chown media system /sys/class/tsync/av_threshold_max
     chown system system /sys/class/graphics/fb0/blank
-    chown media system /sys/class/graphics/fb0/free_scale_switch
+    chown system graphics /sys/class/graphics/fb0/free_scale_switch
     chown media system /sys/class/graphics/fb1/blank
     chown media system /sys/class/graphics/fb0/order
     chown media system /sys/class/graphics/fb1/order
@@ -109,10 +109,12 @@ on boot
     chown media system /sys/class/graphics/fb0/enable_key_onhold
     chown media system /sys/module/amlvideodri/parameters/freerun_mode
     chown media system /sys/module/ionvideo/parameters/freerun_mode
+    chown system graphics /sys/module/fb/parameters/osd_logo_index
 
     chmod 0664 /sys/class/graphics/fb0/blank
     chmod 0664 /sys/class/graphics/fb1/blank
     chmod 0664 /sys/class/graphics/fb0/free_scale_switch
+    chmod 0660 /sys/module/fb/parameters/osd_logo_index
 
     chown media system /sys/class/video/blackout_policy
     chown media system /sys/class/video/screen_mode
diff --git a/common/products/mbox/init.amlogic.rc b/common/products/mbox/init.amlogic.rc
index 84e920e..536a7e1 100644
--- a/common/products/mbox/init.amlogic.rc
+++ b/common/products/mbox/init.amlogic.rc
@@ -101,7 +101,7 @@ on boot
     chown media system /sys/class/tsync/av_threshold_min
     chown media system /sys/class/tsync/av_threshold_max
     chown system system /sys/class/graphics/fb0/blank
-    chown media system /sys/class/graphics/fb0/free_scale_switch
+    chown system graphics /sys/class/graphics/fb0/free_scale_switch
     chown media system /sys/class/graphics/fb1/blank
     chown media system /sys/class/graphics/fb0/order
     chown media system /sys/class/graphics/fb1/order
@@ -109,10 +109,12 @@ on boot
     chown media system /sys/class/graphics/fb0/enable_key_onhold
     chown media system /sys/module/amlvideodri/parameters/freerun_mode
     chown media system /sys/module/ionvideo/parameters/freerun_mode
+    chown system graphics /sys/module/fb/parameters/osd_logo_index
 
     chmod 0664 /sys/class/graphics/fb0/blank
     chmod 0664 /sys/class/graphics/fb1/blank
     chmod 0664 /sys/class/graphics/fb0/free_scale_switch
+    chmod 0660 /sys/module/fb/parameters/osd_logo_index
 
     chown media system /sys/class/video/blackout_policy
     chown media system /sys/class/video/screen_mode
diff --git a/common/products/tv/init.amlogic.rc b/common/products/tv/init.amlogic.rc
index 9ce53ff..7926223 100644
--- a/common/products/tv/init.amlogic.rc
+++ b/common/products/tv/init.amlogic.rc
@@ -115,7 +115,7 @@ on boot
     chown media system /sys/class/tsync/av_threshold_min
     chown media system /sys/class/tsync/av_threshold_max
     chown system system /sys/class/graphics/fb0/blank
-    chown media system /sys/class/graphics/fb0/free_scale_switch
+    chown system graphics /sys/class/graphics/fb0/free_scale_switch
     chown media system /sys/class/graphics/fb1/blank
     chown media system /sys/class/graphics/fb0/order
     chown media system /sys/class/graphics/fb1/order
@@ -123,10 +123,12 @@ on boot
     chown media system /sys/class/graphics/fb0/enable_key_onhold
     chown media system /sys/module/amlvideodri/parameters/freerun_mode
     chown media system /sys/module/ionvideo/parameters/freerun_mode
+    chown system graphics /sys/module/fb/parameters/osd_logo_index
 
     chmod 0664 /sys/class/graphics/fb0/blank
     chmod 0664 /sys/class/graphics/fb1/blank
     chmod 0664 /sys/class/graphics/fb0/free_scale_switch
+    chmod 0660 /sys/module/fb/parameters/osd_logo_index
 
     chown media system /sys/class/video/blackout_policy
     chown media system /sys/class/video/screen_mode
diff --git a/common/sepolicy/system_control.te b/common/sepolicy/system_control.te
index 828b97b..706d561 100644
--- a/common/sepolicy/system_control.te
+++ b/common/sepolicy/system_control.te
@@ -73,7 +73,6 @@ set_prop(system_control, ctl_bugreport_prop)
 
 allow system_control block_device:dir r_dir_perms;
 
-allow system_control graphics_device:dir r_dir_perms;
 allow system_control sysfs_audio_cap:file {open getattr read};
 allow system_control sysfs_xbmc:file rw_file_perms;
 allow system_control app_data_file:file rw_file_perms;
--
cgit