Merge "Guard against NPE in ServiceConnector" into rvc-dev

2020-06-16 23:11:11 +00:00
parent 11fcb1987a 2ae38f3856
commit 892d269b65
1 changed files with 1 additions and 1 deletions
--- 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