release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-43... (207c11db) · Commits · e / os / android_frameworks_base

core/java/android/view/textclassifier/TextClassification.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ public final class TextClassification {
		* @hide
		*/
		Builder setVersionInfo(@NonNull String versionInfo) {
		mVersionInfo = Preconditions.checkNotNull(mVersionInfo);
		mVersionInfo = Preconditions.checkNotNull(versionInfo);
		return this;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ public final class TextSelection {
		* @hide
		*/
		Builder setVersionInfo(@NonNull String versionInfo) {
		mVersionInfo = Preconditions.checkNotNull(mVersionInfo);
		mVersionInfo = Preconditions.checkNotNull(versionInfo);
		return this;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ public final class SmartSelectionEventTracker {
		private static void debugLog(LogMaker log) {
		if (!DEBUG_LOG_ENABLED) return;

		final String tag = Objects.toString(log.getTaggedData(TAG), "tag");
		final int index = Integer.parseInt(Objects.toString(log.getTaggedData(INDEX), ZERO));

		final String event;
		@@ -291,7 +292,6 @@ public final class SmartSelectionEventTracker {
		event = "RESET";
		break;
		case SelectionEvent.EventType.SELECTION_STARTED:
		final String tag = Objects.toString(log.getTaggedData(TAG), "tag");
		String sessionId = Objects.toString(log.getTaggedData(SESSION_ID), "");
		sessionId = sessionId.substring(sessionId.lastIndexOf("-") + 1);
		Log.d(LOG_TAG, String.format("New selection session: %s(%s)", tag, sessionId));
		@@ -326,8 +326,8 @@ public final class SmartSelectionEventTracker {
		final String entity = Objects.toString(
		log.getTaggedData(ENTITY_TYPE), TextClassifier.TYPE_UNKNOWN);

		Log.d(LOG_TAG, String.format("%2d: %s, context=%d,%d - old=%d,%d [%s]",
		index, event, eventStart, eventEnd, smartStart, smartEnd, entity));
		Log.d(LOG_TAG, String.format("%2d: %s, context=%d,%d - old=%d,%d [%s] (%s)",
		index, event, eventStart, eventEnd, smartStart, smartEnd, entity, tag));
		}

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,10 @@ public class WebViewClient {
		* other than the UI thread so clients should exercise caution
		* when accessing private data or the view system.
		*
		* <p>Note: when Safe Browsing is enabled, these URLs still undergo Safe Browsing checks. If
		* this is undesired, whitelist the URL with {@link WebView#setSafeBrowsingWhitelist} or ignore
		* the warning with {@link #onSafeBrowsingHit}.
		*
		* @param view The {@link android.webkit.WebView} that is requesting the
		* resource.
		* @param url The raw url of the resource.
		@@ -177,6 +181,10 @@ public class WebViewClient {
		* other than the UI thread so clients should exercise caution
		* when accessing private data or the view system.
		*
		* <p>Note: when Safe Browsing is enabled, these URLs still undergo Safe Browsing checks. If
		* this is undesired, whitelist the URL with {@link WebView#setSafeBrowsingWhitelist} or ignore
		* the warning with {@link #onSafeBrowsingHit}.
		*
		* @param view The {@link android.webkit.WebView} that is requesting the
		* resource.
		* @param request Object containing the details of the request.

+2 −1

Original line number	Diff line number	Diff line
		@@ -1250,7 +1250,8 @@ public class Editor {
		}
		}

		void sendOnTextChanged(int start, int after) {
		void sendOnTextChanged(int start, int before, int after) {
		getSelectionActionModeHelper().onTextChanged(start, start + before);
		updateSpellCheckSpans(start, start + after, false);

		// Flip flag to indicate the word iterator needs to have the text reset.