commit 68258e8444e0daa967b007edf659e8bb7b38c59f
author Paul Crowley <paulcrowley@google.com> Mon Oct 28 07:55:03 2019 -0700
committer Paul Crowley <paulcrowley@google.com> Tue Nov 05 16:26:43 2019 -0800
tree cfc0af3158e4e08000efd12b79b879fa98236a0c
parent 46452100977f66956175793a9557b0263bb58e0b

Make encryption action an argument to mkdir

FscryptSetDirectoryPolicy no longer tries to infer the action from the
filename. Well mostly; it still assumes top-level directories in /data
should be encrypted unless the mkdir arguments say otherwise, but
it warns.

Bug: 26641735
Test: boot, check log messages
Change-Id: Id6d2cea7fb856f17323897d85cf6190c981b443c

rootdir/init.usb.rc

diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index b6cba90..3fbc142 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -9,7 +9,7 @@
     chown system system /sys/class/android_usb/android0/f_rndis/ethaddr
     chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr
     mkdir /data/misc/adb 02750 system shell
-    mkdir /data/adb 0700 root root
+    mkdir /data/adb 0700 root root encryption=Require
 
 # adbd is controlled via property triggers in init.<platform>.usb.rc
 service adbd /system/bin/adbd --root_seclabel=u:r:su:s0