From d53955329c81af119c7c3a9339d965f46cefb2ef Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Mon, 26 Aug 2019 18:07:48 -0700
Subject: [PATCH] Update mTransport check before trying to configure.

Line was too long in previous commit so just updating that fix and
cleaning it up.

Bug: 139554125
Test: atest android.content.ContentProviderTest
Change-Id: Ie63151db35cc47f691b5a4733409c10b1ac4299c
---
 core/java/android/content/ContentProvider.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index f297c0631a300..9dbfbc7795a3d 100644
--- 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;
         }
     }