From 9a497640c74db12a5d07fe194e3164c3d5e5713c Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 23 Apr 2020 13:15:10 -0600
Subject: Open all files with O_NOFOLLOW.

SD cards don't support symlinks, so we have no reason to try
following them if somehow an evil caller is able to sneak them into
the database.

Also fix deploy.sh to work after recent apexd changes.

Bug: 124329382
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Idb1f3ee1db90913a97a50515003f211519037066
---
 deploy.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'deploy.sh')

diff --git a/deploy.sh b/deploy.sh
index 22524c0ba..e6edccee8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,6 +8,7 @@ adb shell stop
 adb remount
 adb sync
 adb shell umount /apex/com.android.mediaprovider*
+adb shell setprop apexd.status '""'
 adb shell setprop ctl.restart apexd
 adb shell rm -rf /system/priv-app/MediaProvider
 adb shell rm -rf /system/priv-app/MediaProviderGoogle
-- 
cgit v1.2.3-59-g8ed1b