Merge "Implements toString in NanoAppMessage/ContextHubMessage" (7289feef) · Commits · e / os / android_frameworks_base

core/java/android/hardware/location/ContextHubMessage.java

+25 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,12 +34,11 @@ import java.util.Arrays;
	@SystemApi		@SystemApi
	@Deprecated		@Deprecated
	public class ContextHubMessage {		public class ContextHubMessage {
			private static final int DEBUG_LOG_NUM_BYTES = 16;
	private int mType;		private int mType;
	private int mVersion;		private int mVersion;
	private byte[]mData;		private byte[]mData;

	private static final String TAG = "ContextHubMessage";

	/**		/**
	* Get the message type		* Get the message type
	*		*
	@@ -136,4 +135,28 @@ public class ContextHubMessage {
	return new ContextHubMessage[size];		return new ContextHubMessage[size];
	}		}
	};		};

			@Override
			public String toString() {
			int length = mData.length;

			String ret =
			"ContextHubMessage[type = " + mType + ", length = " + mData.length + " bytes](";
			if (length > 0) {
			ret += "data = 0x";
			}
			for (int i = 0; i < Math.min(length, DEBUG_LOG_NUM_BYTES); i++) {
			ret += Byte.toHexString(mData[i], true /* upperCase */);

			if ((i + 1) % 4 == 0) {
			ret += " ";
			}
			}
			if (length > DEBUG_LOG_NUM_BYTES) {
			ret += "...";
			}
			ret += ")";

			return ret;
			}
	}		}

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.os.Parcelable;
	*/		*/
	@SystemApi		@SystemApi
	public final class NanoAppMessage implements Parcelable {		public final class NanoAppMessage implements Parcelable {
			private static final int DEBUG_LOG_NUM_BYTES = 16;
	private long mNanoAppId;		private long mNanoAppId;
	private int mMessageType;		private int mMessageType;
	private byte[] mMessageBody;		private byte[] mMessageBody;
	@@ -142,4 +143,29 @@ public final class NanoAppMessage implements Parcelable {
	return new NanoAppMessage[size];		return new NanoAppMessage[size];
	}		}
	};		};

			@Override
			public String toString() {
			int length = mMessageBody.length;

			String ret = "NanoAppMessage[type = " + mMessageType + ", length = " + mMessageBody.length
			+ " bytes, " + (mIsBroadcasted ? "broadcast" : "unicast") + ", nanoapp = 0x"
			+ Long.toHexString(mNanoAppId) + "](";
			if (length > 0) {
			ret += "data = 0x";
			}
			for (int i = 0; i < Math.min(length, DEBUG_LOG_NUM_BYTES); i++) {
			ret += Byte.toHexString(mMessageBody[i], true /* upperCase */);

			if ((i + 1) % 4 == 0) {
			ret += " ";
			}
			}
			if (length > DEBUG_LOG_NUM_BYTES) {
			ret += "...";
			}
			ret += ")";

			return ret;
			}
	}		}

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -113,9 +113,7 @@ import java.util.function.Consumer;
	NanoAppMessage clientMessage = ContextHubServiceUtil.createNanoAppMessage(message);		NanoAppMessage clientMessage = ContextHubServiceUtil.createNanoAppMessage(message);

	if (DEBUG_LOG_ENABLED) {		if (DEBUG_LOG_ENABLED) {
	String targetAudience = clientMessage.isBroadcastMessage() ? "broadcast" : "unicast";		Log.v(TAG, "Received " + clientMessage);
	Log.v(TAG, "Received a " + targetAudience + " message from nanoapp 0x"
	+ Long.toHexString(clientMessage.getNanoAppId()));
	}		}

	if (clientMessage.isBroadcastMessage()) {		if (clientMessage.isBroadcastMessage()) {