diff options
| author | 2021-12-06 07:41:17 +0000 | |
|---|---|---|
| committer | 2021-12-06 07:41:17 +0000 | |
| commit | ae0939cf4a6cc06d21b714487d11d3921b68edb0 (patch) | |
| tree | 088939ca3305bd30ac7178181e45f6d6a8e6d163 | |
| parent | 49620a7f087755231fabc0012ca21d6144f26de6 (diff) | |
| parent | 63fed23659aff194213e268ad1c4ce4b8b243bbf (diff) | |
Merge "Fix the typos on the java doc" am: 63fed23659
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909901
Change-Id: I9773daadb710c87c1b2df5d5931d563e01b83d47
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 2c4ff5889263..84c9fa9b375c 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -409,7 +409,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * Value for {@link #flags}: {@code true} if the application may use cleartext network traffic - * (e.g., HTTP rather than HTTPS; WebSockets rather than WebSockets Secure; XMPP, IMAP, STMP + * (e.g., HTTP rather than HTTPS; WebSockets rather than WebSockets Secure; XMPP, IMAP, SMTP * without STARTTLS or TLS). If {@code false}, the app declares that it does not intend to use * cleartext network traffic, in which case platform components (e.g., HTTP stacks, * {@code DownloadManager}, {@code MediaPlayer}) will refuse app's requests to use cleartext diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index d052d70442c4..f4acfaa1baca 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -547,7 +547,7 @@ <attr name="allowTaskReparenting" format="boolean" /> <!-- Declare that this application may use cleartext traffic, such as HTTP rather than HTTPS; - WebSockets rather than WebSockets Secure; XMPP, IMAP, STMP without STARTTLS or TLS. + WebSockets rather than WebSockets Secure; XMPP, IMAP, SMTP without STARTTLS or TLS. Defaults to true. If set to false {@code false}, the application declares that it does not intend to use cleartext network traffic, in which case platform components (e.g. HTTP stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse applications's requests @@ -1762,7 +1762,7 @@ <!-- @deprecated replaced by setting appCategory attribute to "game" --> <attr name="isGame" /> <!-- Declare that this application may use cleartext traffic, such as HTTP rather than - HTTPS; WebSockets rather than WebSockets Secure; XMPP, IMAP, STMP without STARTTLS or + HTTPS; WebSockets rather than WebSockets Secure; XMPP, IMAP, SMTP without STARTTLS or TLS). Defaults to true. If set to false {@code false}, the application declares that it does not intend to use cleartext network traffic, in which case platform components (e.g. HTTP stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse |