Merge "Fix regressions in existing constructors of TextInfo" (e3d2479a) · Commits · e / os / android_frameworks_base

core/java/android/view/textservice/TextInfo.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -31,12 +31,15 @@ public final class TextInfo implements Parcelable {
		private final int mCookie;
		private final int mSequenceNumber;

		private static final int DEFAULT_COOKIE = 0;
		private static final int DEFAULT_SEQUENCE_NUMBER = 0;

		/**
		* Constructor.
		* @param text the text which will be input to TextService
		*/
		public TextInfo(String text) {
		this(text, 0, 0, 0, 0);
		this(text, 0, getStringLengthOrZero(text), DEFAULT_COOKIE, DEFAULT_SEQUENCE_NUMBER);
		}

		/**
		@@ -46,7 +49,11 @@ public final class TextInfo implements Parcelable {
		* @param sequenceNumber the sequence number for this TextInfo
		*/
		public TextInfo(String text, int cookie, int sequenceNumber) {
		this(text, 0, 0, 0, 0);
		this(text, 0, getStringLengthOrZero(text), cookie, sequenceNumber);
		}

		private static int getStringLengthOrZero(final String text) {
		return TextUtils.isEmpty(text) ? 0 : text.length();
		}

		/**