Commit c727d39f authored Jun 16, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jun 16, 2020

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859

Change-Id: Idd48f43080ea27af04d0b6e27a308304d8d14104

parents 37de161e 892d269b

core/java/com/android/internal/infra/ServiceConnector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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