Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the typos on the java doc" am: 63fed23659

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909901

Change-Id: I9773daadb710c87c1b2df5d5931d563e01b83d47
This commit is contained in:
Rhed Jao
2021-12-06 07:41:17 +00:00
committed by Automerger Merge Worker
parent 49620a7f08 63fed23659
commit ae0939cf4a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -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 * 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 * 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, * cleartext network traffic, in which case platform components (e.g., HTTP stacks,
* {@code DownloadManager}, {@code MediaPlayer}) will refuse app's requests to use cleartext * {@code DownloadManager}, {@code MediaPlayer}) will refuse app's requests to use cleartext

4
core/res/res/values/attrs_manifest.xml
View File

@@ -547,7 +547,7 @@
<attr name="allowTaskReparenting" format="boolean" /> <attr name="allowTaskReparenting" format="boolean" />
<!-- Declare that this application may use cleartext traffic, such as HTTP rather than HTTPS; <!-- 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 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 intend to use cleartext network traffic, in which case platform components (e.g. HTTP
stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse applications's requests stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse applications's requests
@@ -1762,7 +1762,7 @@
<!-- @deprecated replaced by setting appCategory attribute to "game" --> <!-- @deprecated replaced by setting appCategory attribute to "game" -->
<attr name="isGame" /> <attr name="isGame" />
<!-- Declare that this application may use cleartext traffic, such as HTTP rather than <!-- 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 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 does not intend to use cleartext network traffic, in which case platform components
(e.g. HTTP stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse (e.g. HTTP stacks, {@code DownloadManager}, {@code MediaPlayer}) will refuse