diff options
Diffstat (limited to 'rootdir')
-rw-r--r-- | rootdir/Android.mk | 3 | ||||
-rw-r--r-- | rootdir/init.rc | 26 | ||||
-rw-r--r-- | rootdir/init.usb.configfs.rc | 11 |
3 files changed, 27 insertions, 13 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 478b8d094..fd9b3ec57 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -93,6 +93,9 @@ ifdef BOARD_USES_PRODUCTIMAGE else LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product $(TARGET_ROOT_OUT)/product endif +ifdef BOARD_USES_METADATA_PARTITION + LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/metadata +endif # For /odm partition. LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/odm diff --git a/rootdir/init.rc b/rootdir/init.rc index d3f038ea5..362f6afab 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -83,7 +83,7 @@ on init restorecon_recursive /mnt mount configfs none /config nodev noexec nosuid - chmod 0775 /config/sdcardfs + chmod 0770 /config/sdcardfs chown system package_info /config/sdcardfs mkdir /mnt/secure 0700 root root @@ -179,6 +179,12 @@ on init copy /dev/cpuset/cpus /dev/cpuset/system-background/cpus copy /dev/cpuset/mems /dev/cpuset/system-background/mems + # restricted is for system tasks that are being throttled + # due to screen off. + mkdir /dev/cpuset/restricted + copy /dev/cpuset/cpus /dev/cpuset/restricted/cpus + copy /dev/cpuset/mems /dev/cpuset/restricted/mems + mkdir /dev/cpuset/top-app copy /dev/cpuset/cpus /dev/cpuset/top-app/cpus copy /dev/cpuset/mems /dev/cpuset/top-app/mems @@ -189,11 +195,13 @@ on init chown system system /dev/cpuset/background chown system system /dev/cpuset/system-background chown system system /dev/cpuset/top-app + chown system system /dev/cpuset/restricted chown system system /dev/cpuset/tasks chown system system /dev/cpuset/foreground/tasks chown system system /dev/cpuset/background/tasks chown system system /dev/cpuset/system-background/tasks chown system system /dev/cpuset/top-app/tasks + chown system system /dev/cpuset/restricted/tasks # set system-background to 0775 so SurfaceFlinger can touch it chmod 0775 /dev/cpuset/system-background @@ -202,6 +210,7 @@ on init chmod 0664 /dev/cpuset/background/tasks chmod 0664 /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/top-app/tasks + chmod 0664 /dev/cpuset/restricted/tasks chmod 0664 /dev/cpuset/tasks @@ -365,6 +374,10 @@ on post-fs # create the lost+found directories, so as to enforce our permissions mkdir /cache/lost+found 0770 root root + restorecon_recursive /metadata + mkdir /metadata/vold + chmod 0700 /metadata/vold + on late-fs # Ensure that tracefs has the correct permissions. # This does not work correctly if it is called in post-fs. @@ -423,6 +436,7 @@ on post-fs-data mkdir /data/misc/carrierid 0770 system radio mkdir /data/misc/apns 0770 system radio mkdir /data/misc/zoneinfo 0775 system system + mkdir /data/misc/network_watchlist 0774 system system mkdir /data/misc/textclassifier 0771 system system mkdir /data/misc/vpn 0770 system vpn mkdir /data/misc/shared_relro 0771 shared_relro shared_relro @@ -455,6 +469,8 @@ on post-fs-data mkdir /data/misc/gcov 0770 root root mkdir /data/vendor 0771 root root + mkdir /data/vendor_ce 0771 root root + mkdir /data/vendor_de 0771 root root mkdir /data/vendor/hardware 0771 root root # For security reasons, /data/local/tmp should always be empty. @@ -687,6 +703,7 @@ on property:vold.decrypt=trigger_load_persist_props on property:vold.decrypt=trigger_post_fs_data trigger post-fs-data + trigger zygote-start on property:vold.decrypt=trigger_restart_min_framework # A/B update verifier that marks a successful boot. @@ -694,6 +711,8 @@ on property:vold.decrypt=trigger_restart_min_framework class_start main on property:vold.decrypt=trigger_restart_framework + stop surfaceflinger + start surfaceflinger # A/B update verifier that marks a successful boot. exec_start update_verifier class_start main @@ -737,11 +756,6 @@ service ueventd /sbin/ueventd seclabel u:r:ueventd:s0 shutdown critical -service healthd /system/bin/healthd - class core - critical - group root system wakelock - service console /system/bin/sh class core console diff --git a/rootdir/init.usb.configfs.rc b/rootdir/init.usb.configfs.rc index de1aab328..3a33c94d3 100644 --- a/rootdir/init.usb.configfs.rc +++ b/rootdir/init.usb.configfs.rc @@ -2,7 +2,6 @@ on property:sys.usb.config=none && property:sys.usb.configfs=1 write /config/usb_gadget/g1/UDC "none" stop adbd setprop sys.usb.ffs.ready 0 - setprop sys.usb.ffs.mtp.ready 0 write /config/usb_gadget/g1/bDeviceClass 0 write /config/usb_gadget/g1/bDeviceSubClass 0 write /config/usb_gadget/g1/bDeviceProtocol 0 @@ -24,7 +23,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.u write /config/usb_gadget/g1/UDC ${sys.usb.controller} setprop sys.usb.state ${sys.usb.config} -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:sys.usb.configfs=1 +on property:sys.usb.config=mtp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp" symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} @@ -33,15 +32,14 @@ on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:s on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 start adbd -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && \ -property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_adb" symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1 symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2 write /config/usb_gadget/g1/UDC ${sys.usb.controller} setprop sys.usb.state ${sys.usb.config} -on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:sys.usb.configfs=1 +on property:sys.usb.config=ptp && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp" symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} @@ -50,8 +48,7 @@ on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:s on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 start adbd -on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && \ -property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 +on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_adb" symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1 symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2 |