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
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index f297c06..9dbfbc7 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -1033,12 +1033,13 @@
/** @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;
}
}