Snap for 6018910 from ecc65c6e34b80927f107aca5bd90607ca22f36a3 to qt-qpr2-release (5ad3a757) · Commits · e / os / android_frameworks_base

Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -1399,6 +1399,7 @@ droidstubs {
		"core/res/AndroidManifest.xml",
		],
		args: metalava_framework_docs_args,
		write_sdk_values: true,
		}

		droidstubs {
		@@ -1408,6 +1409,7 @@ droidstubs {
		"core/res/AndroidManifest.xml",
		],
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ",
		write_sdk_values: true,
		}

		droiddoc {
		@@ -1431,7 +1433,6 @@ droiddoc {
		],
		proofread_file: "offline-sdk-docs-proofrerad.txt",
		args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"",
		write_sdk_values: true,
		static_doc_index_redirect: "docs/docs-preview-index.html",
		}

		@@ -1449,7 +1450,6 @@ droiddoc {
		],
		proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt",
		args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly",
		write_sdk_values: true,
		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
		static_doc_properties: "docs/source.properties",
		}
		@@ -1469,7 +1469,6 @@ droiddoc {
		proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",
		args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" +
		" -offlinemode -title \"Android System SDK\" -referenceonly",
		write_sdk_values: true,
		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
		static_doc_properties: "docs/source.properties",
		}

Android.mk

+18 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,24 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip
		.PHONY: docs offline-sdk-docs
		docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp

		SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON)
		SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\
		activity_actions.txt \
		broadcast_actions.txt \
		categories.txt \
		features.txt \
		service_actions.txt \
		widgets.txt)
		SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES))
		$(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES))
		$(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip
		rm -rf $(SDK_METADATA_DIR)
		mkdir -p $(SDK_METADATA_DIR)
		unzip -qo $< -d $(SDK_METADATA_DIR)

		.PHONY: framework-doc-stubs
		framework-doc-stubs: $(SDK_METADATA)

		# Run this for checkbuild
		checkbuild: doc-comment-check-docs

core/java/android/app/PendingIntent.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -1257,7 +1257,12 @@ public final class PendingIntent implements Parcelable {
		return b != null ? new PendingIntent(b, in.getClassCookie(PendingIntent.class)) : null;
		}

		/package/ PendingIntent(IIntentSender target) {
		/**
		* Creates a PendingIntent with the given target.
		* @param target the backing IIntentSender
		* @hide
		*/
		public PendingIntent(IIntentSender target) {
		mTarget = target;
		}

core/java/android/app/admin/DevicePolicyManager.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -4032,9 +4032,17 @@ public class DevicePolicyManager {
		* Make the device lock immediately, as if the lock screen timeout has expired at the point of
		* this call.
		* <p>
		* This method secures the device in response to an urgent situation, such as a lost or stolen
		* device. After this method is called, the device must be unlocked using strong authentication
		* (PIN, pattern, or password). This API is intended for use only by device admins.
		* <p>
		* The calling device admin must have requested {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK}
		* to be able to call this method; if it has not, a security exception will be thrown.
		* <p>
		* If there's no lock type set, this method forces the device to go to sleep but doesn't lock
		* the device. Device admins who find the device in this state can lock an otherwise-insecure
		* device by first calling {@link #resetPassword} to set the password and then lock the device.
		* <p>
		* This method can be called on the {@link DevicePolicyManager} instance returned by
		* {@link #getParentProfileInstance(ComponentName)} in order to lock the parent profile.
		* <p>
		@@ -4051,9 +4059,17 @@ public class DevicePolicyManager {
		* Make the device lock immediately, as if the lock screen timeout has expired at the point of
		* this call.
		* <p>
		* This method secures the device in response to an urgent situation, such as a lost or stolen
		* device. After this method is called, the device must be unlocked using strong authentication
		* (PIN, pattern, or password). This API is intended for use only by device admins.
		* <p>
		* The calling device admin must have requested {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK}
		* to be able to call this method; if it has not, a security exception will be thrown.
		* <p>
		* If there's no lock type set, this method forces the device to go to sleep but doesn't lock
		* the device. Device admins who find the device in this state can lock an otherwise-insecure
		* device by first calling {@link #resetPassword} to set the password and then lock the device.
		* <p>
		* This method can be called on the {@link DevicePolicyManager} instance returned by
		* {@link #getParentProfileInstance(ComponentName)} in order to lock the parent profile.
		*
		@@ -8080,7 +8096,7 @@ public class DevicePolicyManager {
		* Sets which system features are enabled when the device runs in lock task mode. This method
		* doesn't affect the features when lock task mode is inactive. Any system features not included
		* in {@code flags} are implicitly disabled when calling this method. By default, only
		* {@link #LOCK_TASK_FEATURE_GLOBAL_ACTIONS} is enabled—all the other features are disabled. To
		* {@link #LOCK_TASK_FEATURE_GLOBAL_ACTIONS} is enabled; all the other features are disabled. To
		* disable the global actions dialog, call this method omitting
		* {@link #LOCK_TASK_FEATURE_GLOBAL_ACTIONS}.
		*

core/java/android/app/contentsuggestions/ContentSuggestionsManager.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,17 @@ import java.util.concurrent.Executor;
		*/
		@SystemApi
		public final class ContentSuggestionsManager {
		/**
		* Key into the extras Bundle passed to {@link #provideContextImage(int, Bundle)}.
		* This can be used to provide the bitmap to
		* {@link android.service.contentsuggestions.ContentSuggestionsService}.
		* The value must be a {@link android.graphics.Bitmap} with the
		* config {@link android.graphics.Bitmap.Config.HARDWARE}.
		*
		* @hide
		*/
		public static final String EXTRA_BITMAP = "android.contentsuggestions.extra.BITMAP";

		private static final String TAG = ContentSuggestionsManager.class.getSimpleName();

		/**
		@@ -70,7 +81,7 @@ public final class ContentSuggestionsManager {
		* system content suggestions service.
		*
		* @param taskId of the task to snapshot.
		* @param imageContextRequestExtras sent with with request to provide implementation specific
		* @param imageContextRequestExtras sent with request to provide implementation specific
		* extra information.
		*/
		public void provideContextImage(