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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859 Change-Id: Idfdbd4dbd5aa7cdcd6526625eb2e82e77d295bf4
2020-06-17 00:04:26 +00:00
parent f5e8788666 edce56bd21
commit 07b4d59d35
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