Remove droidguard disabling
Merge from Widevine repo of http://go/wvgerrit/131249 We no longer need to disable DroidGuard when running our tests. Bug: 195770435 Change-Id: Ia17e611dd47e125692abe968dc45d63da81b0a13
This commit is contained in:
@@ -60,13 +60,6 @@ adb_shell_run() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Use Package Manager (via adb shell) to enable or disable DroidGuard.
|
||||
# Disabling DroidGuard during the test run prevents concurrency issues
|
||||
# with provisioning status.
|
||||
set_droidguard() {
|
||||
adb $SERIAL_NUM shell pm $1 com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService
|
||||
}
|
||||
|
||||
if [ -z "$ANDROID_BUILD_TOP" ]; then
|
||||
echo "Android build environment not set"
|
||||
exit -1
|
||||
@@ -83,9 +76,6 @@ if echo $ADB_OUTPUT | grep -qi "verity"; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# Disable DroidGuard to prevent provisioning collisions
|
||||
set_droidguard disable
|
||||
|
||||
# Run oemcrypto tests first due to historical test order issues
|
||||
adb_shell_run oemcrypto_test \
|
||||
GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes
|
||||
@@ -152,6 +142,3 @@ if adb $SERIAL_NUM shell ls /vendor/lib/libwvhidl.so &> /dev/null ||
|
||||
adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then
|
||||
adb_shell_run libwvdrmengine_hidl_test
|
||||
fi
|
||||
|
||||
# Re-enable DroidGuard
|
||||
set_droidguard enable
|
||||
|
||||
Reference in New Issue
Block a user