Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859 Change-Id: I404cfa16b540306c4bf5d036096476a5fe6c6845
2020-06-18 14:28:51 +00:00
parent 14d852adc6 163686b1b6
commit 9d9b74e012
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