Merge changes from topic 'elabel' into oc-dr1-dev

am: 8014ac1c9a

Change-Id: Id1431b3ef7d37ab6723253e2abb400981297798e

device.mk

@@ -59,6 +59,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init.hardware.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).rc \
     $(LOCAL_PATH)/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wahoo.usb.rc \
     $(LOCAL_PATH)/ueventd.hardware.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
+    $(LOCAL_PATH)/init.elabel.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/init.elabel.sh \
     $(LOCAL_PATH)/init.power.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.power.sh \
     $(LOCAL_PATH)/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh \
     $(LOCAL_PATH)/uinput-fpc.kl:system/usr/keylayout/uinput-fpc.kl \

init.elabel.sh

@@ -0,0 +1,10 @@
+#! /system/bin/sh
+
+if [ -d /persist/elabel ]; then
+    if [ ! -f /data/misc/elabel/elabels_copied ]; then
+        cp /persist/elabel/* /data/misc/elabel/
+        echo 1 > /data/misc/elabel/elabels_copied
+        chown system.system /data/misc/elabel/*
+        chmod 400 /data/misc/elabel/*
+    fi
+fi

init.hardware.rc

@@ -158,6 +158,7 @@ on fs
     mkdir /persist/display 0770 system graphics
     mkdir /persist/rfs 0770 root system
     mkdir /persist/hlos_rfs 0770 root system
+    mkdir /persist/elabel 0700 system system
     chmod 0770 /persist/rfs
     chmod 0770 /persist/rfs/shared
     chmod 0770 /persist/rfs/msm
@@ -351,6 +352,10 @@ on zygote-start
     mkdir /data/nfc/param 0770 nfc nfc
     mkdir /data/vendor/nfc 0770 nfc nfc
 
+    # b/62837579 elabel directory
+    mkdir /data/misc/elabel 0700 system system
+
+
 on early-boot
     # wait for devices
     wait_for_prop sys.qcom.devup 1
@@ -429,6 +434,12 @@ on boot
     # default country code
     setprop ro.boot.wificountrycode 00
 
+service init-elabel-sh /system/bin/init.elabel.sh
+    class late_start
+    user system
+    group system
+    oneshot
+
 service init-radio-sh /vendor/bin/init.radio.sh
     class late_start
     user radio

sepolicy/private/file_contexts

@@ -1 +1,3 @@
 /system/bin/folio_daemon        u:object_r:folio_daemon_exec:s0
+/data/misc/elabel(/.*)?         u:object_r:elabel_data_file:s0
+/system/bin/init\.elabel\.sh    u:object_r:init_elabel_exec:s0

sepolicy/private/init_elabel.te

@@ -0,0 +1,12 @@
+# /system/bin/init.elabel.sh
+#
+# write data from /persist/elabel to /data/misc/elabel for use by
+# settings app
+#
+init_daemon_domain(init_elabel)
+
+allow init_elabel shell_exec:file rx_file_perms;
+allow init_elabel toolbox_exec:file rx_file_perms;
+
+allow init_elabel elabel_data_file:dir rw_dir_perms;
+allow init_elabel elabel_data_file:file create_file_perms;

sepolicy/public/file.te

@@ -0,0 +1 @@
+type elabel_data_file, file_type, data_file_type;

sepolicy/public/init_elabel.te

@@ -0,0 +1,7 @@
+# /system/bin/init.elabel.sh
+#
+# write data from /persist/elabel to /data/misc/elabel for use by
+# settings app
+#
+type init_elabel, domain, coredomain;
+type init_elabel_exec, exec_type, file_type;

sepolicy/vendor/file.te

@@ -48,6 +48,7 @@ type persist_file, file_type;
 type persist_data_file, file_type;
 type persist_display_file, file_type;
 type persist_drm_file, file_type;
+type persist_elabel_file, file_type;
 type persist_haptics_file, file_type;
 type persist_rfs_file, file_type;
 type persist_sensors_file, file_type;

sepolicy/vendor/file_contexts

@@ -253,6 +253,7 @@
 /persist/data(/.*)?       u:object_r:persist_data_file:s0
 /persist/display(/.*)?    u:object_r:persist_display_file:s0
 /persist/drm(/.*)?        u:object_r:persist_drm_file:s0
+/persist/elabel(/.*)?     u:object_r:persist_elabel_file:s0
 /persist/haptics(/.*)?    u:object_r:persist_haptics_file:s0
 /persist/hlos_rfs(/.*)?   u:object_r:persist_rfs_file:s0
 /persist/rfs(/.*)?        u:object_r:persist_rfs_file:s0

sepolicy/vendor/init_elabel.te

@@ -0,0 +1,8 @@
+# /system/bin/init.elabel.sh
+#
+# write data from /persist/elabel to /data/misc/elabel for use by
+# settings app
+#
+allow init_elabel persist_file:dir {search getattr};
+allow init_elabel persist_elabel_file:dir r_dir_perms;
+allow init_elabel persist_elabel_file:file r_file_perms;

sepolicy/vendor/system_app.te

@@ -1,3 +1,7 @@
 # Needed by Settings app's TelephonyMonitorPreferenceController, available only on a subset of
 # userdebug and eng devices
 userdebug_or_eng(`set_prop(system_app, tel_mon_prop)')
+
+# read regulatory info
+allow system_app elabel_data_file:dir r_dir_perms;
+allow system_app elabel_data_file:file r_file_perms;