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

Commit 0cf9bfd4 authored by Victor Hsieh's avatar Victor Hsieh Committed by android-build-merger
Browse files

Merge "Do not restrict .fs-verity keyring in debuggable build"

am: be515254

Change-Id: I544db4a4e13de0fe680a15814c139155c32bf093
parents 3d213c39 be515254
Loading
Loading
Loading
Loading
+6 −3
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ for cert in /product/etc/security/fsverity/*.der; do
    log -p e -t fsverity_init "Failed to load $cert"
    log -p e -t fsverity_init "Failed to load $cert"
done
done


DEBUGGABLE=$(getprop ro.debuggable)
if [ $DEBUGGABLE != "1" ]; then
  # Prevent future key links to .fs-verity keyring
  # Prevent future key links to .fs-verity keyring
  /system/bin/mini-keyctl restrict_keyring .fs-verity ||
  /system/bin/mini-keyctl restrict_keyring .fs-verity ||
    log -p e -t fsverity_init "Failed to restrict .fs-verity keyring"
    log -p e -t fsverity_init "Failed to restrict .fs-verity keyring"
fi