summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-08-23 17:43:37 -0700
committerJeff Brown <jeffbrown@google.com>2013-08-23 17:44:47 -0700
commit511cd35fcc0b8ab048f284a6af374de8ccc69865 (patch)
tree139bdfde019792727899f46d1999d9ae8ec7b4b6 /core
parentc264e0440076ccca4be6ec66e33bcd7f8a1ae5b3 (diff)
downloadframeworks_base-511cd35fcc0b8ab048f284a6af374de8ccc69865.zip
frameworks_base-511cd35fcc0b8ab048f284a6af374de8ccc69865.tar.gz
frameworks_base-511cd35fcc0b8ab048f284a6af374de8ccc69865.tar.bz2
Docs changes pursuant to API review feedback.
Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/Context.java2
-rw-r--r--core/java/android/content/Intent.java2
-rw-r--r--core/java/android/database/Cursor.java5
-rw-r--r--core/java/android/hardware/display/DisplayManager.java8
-rw-r--r--core/res/AndroidManifest.xml8
5 files changed, 13 insertions, 12 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index ff81f72..cd1f87b 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2375,7 +2375,7 @@ public abstract class Context {
/**
* {@link android.print.PrintManager} for printing and managing
- * printers and print taks.
+ * printers and print tasks.
*
* @see #getSystemService
* @see android.print.PrintManager
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index be13620..c99f09c 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1193,7 +1193,7 @@ public class Intent implements Parcelable, Cloneable {
/**
* An optional field on {@link #ACTION_ASSIST} and {@link #ACTION_VOICE_ASSIST}
- * containing an the names of the application package of foreground services at the time
+ * containing the application package names of foreground services at the time
* of the assist request. This is an array of {@link String}s, with one entry
* per service.
*/
diff --git a/core/java/android/database/Cursor.java b/core/java/android/database/Cursor.java
index 7381e2c..fc2a885 100644
--- a/core/java/android/database/Cursor.java
+++ b/core/java/android/database/Cursor.java
@@ -25,9 +25,12 @@ import java.io.Closeable;
/**
* This interface provides random read-write access to the result set returned
* by a database query.
- *
+ * <p>
* Cursor implementations are not required to be synchronized so code using a Cursor from multiple
* threads should perform its own synchronization when using the Cursor.
+ * </p><p>
+ * Implementations should subclass {@link AbstractCursor}.
+ * </p>
*/
public interface Cursor extends Closeable {
/*
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index 0071865..f12be5f 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -74,8 +74,7 @@ public final class DisplayManager {
* richer second screen experiences.
* </p>
*
- * @see android.app.Presentation for information about presenting content
- * on secondary displays.
+ * @see android.app.Presentation
* @see Display#FLAG_PRESENTATION
* @see #getDisplays(String)
*/
@@ -138,8 +137,7 @@ public final class DisplayManager {
* more special-purpose displays.
* </p>
*
- * @see android.app.Presentation for information about presenting content
- * on secondary displays.
+ * @see android.app.Presentation
* @see #createVirtualDisplay
* @see #DISPLAY_CATEGORY_PRESENTATION
* @see Display#FLAG_PRESENTATION
@@ -168,7 +166,7 @@ public final class DisplayManager {
* The content of secure windows will be blanked if shown on this display.
* </p>
*
- * @see Display#FLAG_SECURE for information about secure displays.
+ * @see Display#FLAG_SECURE
* @see #createVirtualDisplay
*/
public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 1 << 2;
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0d1ace8..faf6e63 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1900,14 +1900,14 @@
android:description="@string/permdesc_bindAccessibilityService"
android:protectionLevel="signature" />
- <!-- Must be required by an {@link android.printservice.PrintService},
+ <!-- Must be required by a {@link android.printservice.PrintService},
to ensure that only the system can bind to it. -->
<permission android:name="android.permission.BIND_PRINT_SERVICE"
android:label="@string/permlab_bindPrintService"
android:description="@string/permdesc_bindPrintService"
android:protectionLevel="signature" />
- <!-- Must be required by an {@link android.nfc.cardemulation.HostApduService}
+ <!-- Must be required by a {@link android.nfc.cardemulation.HostApduService}
or {@link android.nfc.cardemulation.OffHostApduService} to ensure that only
the system can bind to it. -->
<permission android:name="android.permission.BIND_NFC_SERVICE"
@@ -1931,7 +1931,7 @@
android:description="@string/permdesc_bindTextService"
android:protectionLevel="signature" />
- <!-- Must be required by an {@link android.net.VpnService},
+ <!-- Must be required by a {@link android.net.VpnService},
to ensure that only the system can bind to it. -->
<permission android:name="android.permission.BIND_VPN_SERVICE"
android:label="@string/permlab_bindVpnService"
@@ -1953,7 +1953,7 @@
android:protectionLevel="signature" />
<!-- Required to add or remove another application as a device admin.
- <p/>Not for use by third-party apps. -->
+ <p/>Not for use by third-party applications. -->
<permission android:name="android.permission.MANAGE_DEVICE_ADMINS"
android:label="@string/permlab_manageDeviceAdmins"
android:description="@string/permdesc_manageDeviceAdmins"