Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1d2682 authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

Merge "Don\'t show UI on default encryption" into mnc-dr-dev 

am: 2b216aa8

* commit '2b216aa8':
  Don't show UI on default encryption
parents e56b5664 2b216aa8

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted 
    # encryption) or trigger_restart_min_framework (other encryption)



# One shot invocation to encrypt unencrypted volumes

service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default

service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default noui

    disabled

    oneshot

    # vold will set vold.decrypt to trigger_restart_framework (default