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

Commit 026f9191 authored by Scott Kennedy's avatar Scott Kennedy Committed by Android Git Automerger
Browse files

am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 

* commit '08342698':
  docs: Fix a bunch of issues
parents 1357617c 08342698

core/java/android/app/AlertDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 


    /**

     * Special theme constant for {@link #AlertDialog(Context, int)}: use

     * the device's default alert theme with a dark background.

     * the device's default alert theme with a light background.

     */

    public static final int THEME_DEVICE_DEFAULT_LIGHT = 5;

core/java/android/app/admin/DeviceAdminInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ public final class DeviceAdminInfo implements Parcelable { 
    public static final int USES_POLICY_DISABLE_CAMERA = 8;



    /**

     * A type of policy that this device admin can use: disables use of keyguard widgets.

     * A type of policy that this device admin can use: disables use of keyguard features.

     *

     * <p>To control this policy, the device admin must have a "disable-keyguard-widgets"

     * <p>To control this policy, the device admin must have a "disable-keyguard-features"

     * tag in the "uses-policies" section of its meta-data.

     */

    public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9;

core/java/android/content/BroadcastReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ import android.util.Slog; 
 *

 * <ul>

 * <li><p>The Intent namespace is global.  Make sure that Intent action names and

 * other strings are written in a namespace you own, or else you may inadvertantly

 * other strings are written in a namespace you own, or else you may inadvertently

 * conflict with other applications.

 * <li><p>When you use {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)},

 * <em>any</em> application may send broadcasts to that registered receiver.  You can

core/java/android/hardware/SensorEventListener.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public interface SensorEventListener { 
     * 

     * <p><b>NOTE:</b> The application doesn't own the

     * {@link android.hardware.SensorEvent event}

     * object passed as a parameter and therefore cannot hold on o it.

     * object passed as a parameter and therefore cannot hold on to it.

     * The object may be part of an internal pool and may be reused by

     * the framework.

     *

core/java/android/provider/ContactsContract.java

+2 −1
Original line number Diff line number Diff line
@@ -4695,7 +4695,8 @@ public final class ContactsContract { 
         * The content:// style URI for this table. Append the phone number you want to lookup

         * to this URI and query it to perform a lookup. For example:

         * <pre>

         * Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_URI, Uri.encode(phoneNumber));

         * Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,

         *         Uri.encode(phoneNumber));

         * </pre>

         */

        public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(AUTHORITY_URI,