Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63fed236 authored by Rhed Jao's avatar Rhed Jao Committed by Gerrit Code Review
Browse files

Merge "Fix the typos on the java doc"

parents 70be96ff 43509f32

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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