Merge "Update mTransport check before trying to configure."

2019-08-27 16:55:06 +00:00
parent a9cebdb500 d53955329c
commit 3bade98359
1 changed files with 7 additions and 6 deletions
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -1033,12 +1033,13 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall

    /** @hide */
    public final void setTransportLoggingEnabled(boolean enabled) {
-        if (mTransport != null) {
-            if (enabled) {
-                mTransport.mInterface = new LoggingContentInterface(getClass().getSimpleName(), this);
-            } else {
-                mTransport.mInterface = this;
-            }
+        if (mTransport == null) {
+            return;
+        }
+        if (enabled) {
+            mTransport.mInterface = new LoggingContentInterface(getClass().getSimpleName(), this);
+        } else {
+            mTransport.mInterface = this;
        }
    }