Merge "ramoops: remount pstore even if decryption fails" into oc-dr1-dev

init.ramoops.sh

@@ -4,13 +4,15 @@
 ramoops -D
 
 if [ $? -eq 0 ]; then
-    # Pivot (and decrypt) and remount pstore
+    # Pivot (and decrypt)
     echo 1 > /sys/devices/virtual/ramoops/pstore/use_alt
-    setprop sys.ramoops.decrypted true
 else
-    setprop sys.ramoops.decrypted Error-$?
+    setprop sys.ramoops.decryption.error $?
 fi
 
+# Trigger remount of pstore regardless of decryption state
+setprop sys.ramoops.decrypted true
+
 # Generate keys (if none exist), and load the keys to carveout
 if [[ $(getprop ro.hardware) == "walleye" ]]; then
     ramoops -g -l -c

sepolicy/private/property_contexts

@@ -1,3 +1,3 @@
 # TODO: delete this once it's in common sepolicy.
 persist.netd.stable_secret    u:object_r:netd_stable_secret_prop:s0
-sys.ramoops.decrypted         u:object_r:ramoops_prop:s0
+sys.ramoops.                  u:object_r:ramoops_prop:s0