Fix docs
Test: m docs
Bug: N/A
Change-Id: I9dbc83779cdc6918cf22ed60dbc82bba820af06f
(cherry picked from commit 125970d8281721cab4b8b818c54b876beb86ce08)
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index 7523949..d9d6b5f 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -310,7 +310,7 @@
public CharSequence nonLocalizedDescription;
/**
- * If {@code true} an application targeting {@link Build.VERSION_CODES.Q} <em>must</em>
+ * If {@code true} an application targeting {@link Build.VERSION_CODES#Q} <em>must</em>
* include permission data usage information in order to be able to be granted this permission.
*/
public boolean usageInfoRequired;
diff --git a/core/java/android/content/pm/UsesPermissionInfo.java b/core/java/android/content/pm/UsesPermissionInfo.java
index 997552b..d08548f 100644
--- a/core/java/android/content/pm/UsesPermissionInfo.java
+++ b/core/java/android/content/pm/UsesPermissionInfo.java
@@ -29,7 +29,8 @@
public final class UsesPermissionInfo extends PackageItemInfo implements Parcelable {
/**
- * Flag for {@link #flags}: the requested permission is currently granted to the application.
+ * Flag for {@link #getFlags()}: the requested permission is currently granted to the
+ * application.
*/
public static final int FLAG_REQUESTED_PERMISSION_GRANTED = 1 << 1;
@@ -46,8 +47,8 @@
/**
* A yes value for {@link #getDataSentOffDevice()}, {@link #getDataSharedWithThirdParty()},
* and {@link #getDataUsedForMonetization()} corresponding to the <code>yes</code> value of
- * {@link android.R.attrs#dataSentOffDevice}, {@link android.R.attrs#dataSharedWithThirdParty},
- * and {@link android.R.attrs#dataUsedForMonetization} attributes.
+ * {@link android.R.attr#dataSentOffDevice}, {@link android.R.attr#dataSharedWithThirdParty},
+ * and {@link android.R.attr#dataUsedForMonetization} attributes.
*/
public static final int USAGE_YES = 1;
@@ -55,16 +56,16 @@
* A user triggered only value for {@link #getDataSentOffDevice()},
* {@link #getDataSharedWithThirdParty()}, and {@link #getDataUsedForMonetization()}
* corresponding to the <code>userTriggered</code> value of
- * {@link android.R.attrs#dataSentOffDevice}, {@link android.R.attrs#dataSharedWithThirdParty},
- * and {@link android.R.attrs#dataUsedForMonetization} attributes.
+ * {@link android.R.attr#dataSentOffDevice}, {@link android.R.attr#dataSharedWithThirdParty},
+ * and {@link android.R.attr#dataUsedForMonetization} attributes.
*/
public static final int USAGE_USER_TRIGGERED = 2;
/**
* A no value for {@link #getDataSentOffDevice()}, {@link #getDataSharedWithThirdParty()},
* and {@link #getDataUsedForMonetization()} corresponding to the <code>no</code> value of
- * {@link android.R.attrs#dataSentOffDevice}, {@link android.R.attrs#dataSharedWithThirdParty},
- * and {@link android.R.attrs#dataUsedForMonetization} attributes.
+ * {@link android.R.attr#dataSentOffDevice}, {@link android.R.attr#dataSharedWithThirdParty},
+ * and {@link android.R.attr#dataUsedForMonetization} attributes.
*/
public static final int USAGE_NO = 3;
@@ -84,25 +85,25 @@
/**
* A data not retained value for {@link #getDataRetention()} corresponding to the
- * <code>notRetained</code> value of {@link android.R.attrs#dataRetentionTime}.
+ * <code>notRetained</code> value of {@link android.R.attr#dataRetentionTime}.
*/
public static final int RETENTION_NOT_RETAINED = 1;
/**
* A user selected value for {@link #getDataRetention()} corresponding to the
- * <code>userSelected</code> value of {@link android.R.attrs#dataRetentionTime}.
+ * <code>userSelected</code> value of {@link android.R.attr#dataRetentionTime}.
*/
public static final int RETENTION_USER_SELECTED = 2;
/**
* An unlimited value for {@link #getDataRetention()} corresponding to the
- * <code>unlimited</code> value of {@link android.R.attrs#dataRetentionTime}.
+ * <code>unlimited</code> value of {@link android.R.attr#dataRetentionTime}.
*/
public static final int RETENTION_UNLIMITED = 3;
/**
* A specified value for {@link #getDataRetention()} corresponding to providing the number of
- * weeks data is retained in {@link android.R.attrs#dataRetentionTime}. The number of weeks
+ * weeks data is retained in {@link android.R.attr#dataRetentionTime}. The number of weeks
* is available in {@link #getDataRetentionWeeks()}.
*/
public static final int RETENTION_SPECIFIED = 4;
@@ -181,7 +182,7 @@
/**
* If the application sends the data guarded by this permission off the device.
*
- * See {@link android.R.attrs#dataSentOffDevice}
+ * See {@link android.R.attr#dataSentOffDevice}
*/
public @Usage int getDataSentOffDevice() {
return mDataSentOffDevice;
@@ -191,7 +192,7 @@
* If the application or its services shares the data guarded by this permission with third
* parties.
*
- * See {@link android.R.attrs#dataSharedWithThirdParty}
+ * See {@link android.R.attr#dataSharedWithThirdParty}
*/
public @Usage int getDataSharedWithThirdParty() {
return mDataSharedWithThirdParty;
@@ -201,7 +202,7 @@
* If the application or its services use the data guarded by this permission for monetization
* purposes.
*
- * See {@link android.R.attrs#dataUsedForMonetization}
+ * See {@link android.R.attr#dataUsedForMonetization}
*/
public @Usage int getDataUsedForMonetization() {
return mDataUsedForMonetization;
@@ -212,7 +213,7 @@
* If set to {@link #RETENTION_SPECIFIED} {@link #getDataRetentionWeeks()} will contain the
* number of weeks the data is stored.
*
- * See {@link android.R.attrs#dataRetentionTime}
+ * See {@link android.R.attr#dataRetentionTime}
*/
public @Retention int getDataRetention() {
return mDataRetention;
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index d5eaa00..089c59f 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1707,7 +1707,7 @@
<!-- Specify if the app uploads data, or derived data, guarded by this permission.
- If the permission is defined with {@link AndroidManifestPermission#usageRequired}
+ If the permission is defined with {@link android.R.attr#usageInfoRequired}
{@code true} this <em>must</em> be specified by apps that target Android Q or the
permission will not be granted, it will be as if the manifest didn't request it at all.
-->
@@ -1727,7 +1727,7 @@
or derived data, guarded by this permission to third parties outside of the developer's
organization that do not qualify as data processors.
- If the permission is defined with {@link AndroidManifestPermission#usageRequired}
+ If the permission is defined with {@link android.R.attr#usageInfoRequired}
{@code true} this <em>must</em> be specified by apps that target Android Q or the
permission will not be granted, it will be as if the manifest didn't request it at all.
-->
@@ -1750,7 +1750,7 @@
For example, if the data is sold to another party or used for targeting advertisements
this must be set to {@code yes}.
- If the permission is defined with {@link AndroidManifestPermission#usageRequired}
+ If the permission is defined with {@link android.R.attr#usageInfoRequired}
{@code true} this <em>must</em> be specified by apps that target Android Q or the
permission will not be granted, it will be as if the manifest didn't request it at all.
-->
@@ -1773,7 +1773,7 @@
This can be one of "notRetained", "userSelected", "unlimited", or a number
representing the number of weeks the data is retained.
- If the permission is defined with {@link AndroidManifestPermission#usageRequired}
+ If the permission is defined with {@link android.R.attr#usageInfoRequired}
{@code true} this <em>must</em> be specified by apps that target Android Q or the
permission will not be granted, it will be as if the manifest didn't request it at all.
-->
