Snap for 5814541 from 0d0bf428b972784868628142af9ef159853826d7 to qt-qpr1-release (ed934b98) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -8341,16 +8341,6 @@ public final class Settings {
		private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not the face unlock education screen has been shown to the user.
		* @hide
		*/
		public static final String FACE_UNLOCK_EDUCATION_INFO_DISPLAYED =
		"face_unlock_education_info_displayed";

		private static final Validator FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not debugging is enabled.
		* @hide
		@@ -9190,8 +9180,6 @@ public final class Settings {
		VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
		FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,
		FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR);
		VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);
		VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
		ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

+2 −4

Original line number	Diff line number	Diff line
		@@ -480,6 +480,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		return;
		}

		mNextFlushForTextChanged = false;

		final int numberEvents = mEvents.size();
		final String reasonString = getFlushReasonAsString(reason);
		if (sDebug) {
		@@ -495,10 +497,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		try {
		mHandler.removeMessages(MSG_FLUSH);

		if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {
		mNextFlushForTextChanged = false;
		}

		final ParceledListSlice<ContentCaptureEvent> events = clearEvents();
		mDirectServiceInterface.sendEvents(events, reason, mManager.mOptions);
		} catch (RemoteException e) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import android.net.Uri;
		* avoid unintentionally granting requests for new permissions, you should pass the
		* specific permissions you intend to grant to {@link #grant(String[]) grant()},
		* and avoid writing code like this example:
		* <pre>
		* <pre class="prettyprint">
		* permissionRequest.grant(permissionRequest.getResources()) // This is wrong!!!
		* </pre>
		* See the WebView's release notes for information about new protected resources.

+11 −9

Original line number	Diff line number	Diff line
		@@ -519,15 +519,17 @@ public class WebChromeClient {
		* may not be supported and applications wishing to support these sources
		* or more advanced file operations should build their own Intent.
		*
		* <pre>
		* How to use:
		* 1. Build an intent using {@link #createIntent}
		* 2. Fire the intent using {@link android.app.Activity#startActivityForResult}.
		* 3. Check for ActivityNotFoundException and take a user friendly action if thrown.
		* 4. Listen the result using {@link android.app.Activity#onActivityResult}
		* 5. Parse the result using {@link #parseResult} only if media capture was not requested.
		* 6. Send the result using filePathCallback of {@link WebChromeClient#onShowFileChooser}
		* </pre>
		* <p>How to use:
		* <ol>
		* <li>Build an intent using {@link #createIntent}</li>
		* <li>Fire the intent using {@link android.app.Activity#startActivityForResult}.</li>
		* <li>Check for ActivityNotFoundException and take a user friendly action if thrown.</li>
		* <li>Listen the result using {@link android.app.Activity#onActivityResult}</li>
		* <li>Parse the result using {@link #parseResult} only if media capture was not
		* requested.</li>
		* <li>Send the result using filePathCallback of {@link
		* WebChromeClient#onShowFileChooser}</li>
		* </ol>
		*
		* @return an Intent that supports basic file chooser sources.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ public class WebView extends AbsoluteLayout
		* encoded. If the data is base64 encoded, the value of the encoding
		* parameter must be {@code "base64"}. HTML can be encoded with {@link
		* android.util.Base64#encodeToString(byte[],int)} like so:
		* <pre>
		* <pre class="prettyprint">
		* String unencodedHtml =
		* "<html><body>'%28' is the code for '('</body></html>";
		* String encodedHtml = Base64.encodeToString(unencodedHtml.getBytes(), Base64.NO_PADDING);
		@@ -1854,7 +1854,7 @@ public class WebView extends AbsoluteLayout
		* important security note below for implications.
		* <p> Note that injected objects will not appear in JavaScript until the page is next
		* (re)loaded. JavaScript should be enabled before injecting the object. For example:
		* <pre>
		* <pre class="prettyprint">
		* class JsObject {
		* {@literal @}JavascriptInterface
		* public String toString() { return "injectedObject"; }