Merge "Ensure that we unset the content provider at tear down"
diff --git a/src/com/android/tradefed/device/NativeDevice.java b/src/com/android/tradefed/device/NativeDevice.java
index bab659a..fa5f924 100644
--- a/src/com/android/tradefed/device/NativeDevice.java
+++ b/src/com/android/tradefed/device/NativeDevice.java
@@ -4039,6 +4039,8 @@
if (getIDevice() instanceof StubDevice) {
return;
}
+ // Reset the Content Provider bit.
+ mShouldSkipContentProviderSetup = false;
try {
// If we never installed it, don't even bother checking for it during tear down.
if (mContentProvider == null) {