Merge "fs_mgr: Harden adb-remount-test.sh by ERR trap handler"

  NORMAL=""

fi

# Set an ERR trap handler to report any unhandled error

trap 'die "line ${LINENO}: unhandled error"' ERR

if ${print_time}; then

  echo "${BLUE}[     INFO ]${NORMAL}" start `date` >&2

fi

# Feed log with selinux denials as baseline before overlays

adb_unroot

adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null

adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null || true

adb_root

D=`adb remount 2>&1`

  echo "${GREEN}[       OK ]${NORMAL} /vendor content correct MAC after reboot" >&2

  # Feed unprivileged log with selinux denials as a result of overlays

  wait_for_screen

  adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null

  adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null || true

fi

# If overlayfs has a nested security problem, this will fail.

B="`adb_ls /system/`" ||

check_eq "${BASE_SYSTEM_DEVT}" "`adb_sh stat --format=%D /system/xbin/su </dev/null`" --warning devt for su after reboot

# Feed log with selinux denials as a result of overlays

adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null

adb_sh find ${MOUNTS} </dev/null >/dev/null 2>/dev/null || true

# Check if the updated libc.so is persistent after reboot.

adb_root &&