commit e16ab01d269a95dc7c97779993449c206158f7f5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 10 17:48:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 17:48:34 2019 +0000
tree 28084061b7e8711bf8a3d590e230d25fc96de713
parent 966c43e0e2b6299d9fabf534bf79bbcfddbd78f5
parent 3cca2bc3b74b528a6ad39848468f788cf10207c0

Merge "Ensure that we unset the content provider at tear down"

src/com/android/tradefed/device/NativeDevice.java

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) {