From 2ae38f38566146cd6ac9242d8fe4e2156b8d0ab4 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Tue, 16 Jun 2020 13:38:01 -0700
Subject: [PATCH] Guard against NPE in ServiceConnector

Fixes: 157759109
Test: presubmit
Change-Id: Ic1f594e667af50c0df8e566be4efdbaab6dccb26
---
 core/java/com/android/internal/infra/ServiceConnector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/infra/ServiceConnector.java b/core/java/com/android/internal/infra/ServiceConnector.java
index e9d7d05fe68d0..167d128a76f80 100644
--- a/core/java/com/android/internal/infra/ServiceConnector.java
+++ b/core/java/com/android/internal/infra/ServiceConnector.java
@@ -709,7 +709,7 @@ public interface ServiceConnector<I extends IInterface> {
                 if (DEBUG) {
                     return mDebugName;
                 }
-                return mDelegate.toString() + " wrapped into " + super.toString();
+                return mDelegate + " wrapped into " + super.toString();
             }
 
             @Override