Merge "Disable DroidGuard to prevent provisioning conflicts"

15 files changed, 30 insertions, 0 deletions

diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml
index 3051ef1..312ce6b 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-engine.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="cdm_engine_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml
index 134c60d..4e0ca93 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-extended-duration.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="cdm_extended_duration_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml
index 827685e..5da6f46 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-cdm-session-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="cdm_session_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml
index cc01f9b..79a1918 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-device-files-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="device_files_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml
index f5e2f40..0b1183d 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-file-store-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="file_store_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml
index 1aa59ed..8fa8f6f 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-init-data-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="initialization_data_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml
index 1d00964..04d60d3 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="libwvdrmdrmplugin_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml
index e2a2a47..0eec62f 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine.xml
@@ -10,5 +10,7 @@
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="libwvdrmengine_test" />
         <option name="ld-library-path" value="/system/vendor/lib/mediadrm" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml
index 9b6428d..38c6c09 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="libwvdrmmediacrypto_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml
index d93ff0b..84d7868 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-license-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="license_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
index b61d741..017421e 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="max_res_engine_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
index 903939f..4e1cdf7 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-oemcrypto.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="oemcrypto_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml
index 5dd4720..733fd0f 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="policy_engine_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml b/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml
index 8d25bf7..4eba344 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-request-license.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="request_license_test" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml
index cd826d9..f63ded0 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-timer-unit.xml
@@ -9,5 +9,7 @@
     <test class="com.android.tradefed.testtype.GTest">
         <option name="native-test-device-path" value="/data/bin" />
         <option name="module-name" value="timer_unittest" />
+        <option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
+        <option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
     </test>
 </configuration>