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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859 Change-Id: If9f33976fa985ee13fd9f219456a24204ba01793
2020-06-16 23:34:51 +00:00
parent a62362b295 c727d39f86
commit edce56bd21
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