Merge "Reformat client info in dumpsys" into main (551d9b71) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -1161,7 +1161,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub

		@Override
		public String toString() {
		StringBuilder out = new StringBuilder("[ContextHubClient ");
		StringBuilder out = new StringBuilder();
		out.append("endpointID: ").append(getHostEndPointId()).append(", ");
		out.append("contextHub: ").append(getAttachedContextHubId()).append(", ");
		if (mAttributionTag != null) {
		@@ -1170,9 +1170,10 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
		if (mPendingIntentRequest.isValid()) {
		out.append("intentCreatorPackage: ").append(mPackage).append(", ");
		out.append("nanoAppId: 0x")
		.append(Long.toHexString(mPendingIntentRequest.getNanoAppId()));
		.append(Long.toHexString(mPendingIntentRequest.getNanoAppId()))
		.append(", ");
		} else {
		out.append("package: ").append(mPackage);
		out.append("package: ").append(mPackage).append(", ");
		}
		if (mMessageChannelNanoappIdMap.size() > 0) {
		out.append("messageChannelNanoappSet: (");
		@@ -1180,15 +1181,15 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
		mMessageChannelNanoappIdMap.entrySet().iterator();
		while (it.hasNext()) {
		Map.Entry<Long, Integer> entry = it.next();
		out.append("0x")
		out.append("Nanoapp 0x")
		.append(Long.toHexString(entry.getKey()))
		.append(" auth state: ")
		.append(": Auth state: ")
		.append(authStateToString(entry.getValue()));
		if (it.hasNext()) {
		out.append(", ");
		}
		}
		out.append(")");
		out.append(")").append(", ");
		}
		synchronized (mWakeLock) {
		out.append("wakelock: ").append(mWakeLock);