summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-16 23:11:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-16 23:11:11 +0000
commit892d269b65e8e840231af6f84e7c8934a17eee46 (patch)
treef5cba8bc6a2e86c72b2e27e0a303b3ee097ec6a6
parent11fcb1987afced671b0af54c37070ed2eb47ccd1 (diff)
parent2ae38f38566146cd6ac9242d8fe4e2156b8d0ab4 (diff)
Merge "Guard against NPE in ServiceConnector" into rvc-dev
-rw-r--r--core/java/com/android/internal/infra/ServiceConnector.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/infra/ServiceConnector.java b/core/java/com/android/internal/infra/ServiceConnector.java
index e9d7d05fe68d..167d128a76f8 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