Merge pull request #160 from tinloaf/fix-fingerprint

Fix fingerprint

rw-system.sh

@@ -537,12 +537,31 @@ if getprop ro.boot.boot_devices |grep -v , |grep -qE .;then
 fi
 
 if [ -c /dev/dsm ];then
+    # /dev/dsm is a magic device on Kirin chipsets that teecd needs to access.
+    # Make sure that permissions are right.
     chown system:system /dev/dsm
     chmod 0660 /dev/dsm
+
+    # The presence of /dev/dsm indicates that we have a teecd,
+    # which needs /sec_storage and /data/sec_storage_data
+
     mkdir -p /data/sec_storage_data
     chown system:system /data/sec_storage_data
-    chcon u:object_r:teecd_data_file_system:s0 /data/sec_storage_data
-    mount /data/sec_storage_data /sec_storage
+    chcon -R u:object_r:teecd_data_file:s0 /data/sec_storage_data
+
+    if mount | grep -q " on /sec_storage " ; then
+        # /sec_storage is already mounted by the vendor, don't try to create and mount it
+        # ourselves. However, some devices have /sec_storage owned by root, which means that
+        # the fingerprint daemon (running as system) cannot access it.
+        chown -R system:system /sec_storage
+        chmod -R 0660 /sec_storage
+        chcon -R u:object_r:teecd_data_file:s0 /sec_storage
+    else
+        # No /sec_storage provided by vendor, mount /data/sec_storage_data to it
+        mount /data/sec_storage_data /sec_storage
+        chown system:system /sec_storage
+        chcon u:object_r:teecd_data_file:s0 /sec_storage
+    fi
 fi
 
 #Try to detect DT2W