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

Merge "Fix unique identifiers best practices links in device ID API docs" into rvc-dev am: 52d15e38ce

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

Change-Id: Ief9350ca156ab0aae99c717ee88b2ed9401499ab
This commit is contained in:
TreeHugger Robot
2020-12-02 06:57:30 +00:00
committed by Automerger Merge Worker
parent 4c639b94d8 52d15e38ce
commit 77c1ba5ac1
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/Build.java
View File

@@ -135,8 +135,8 @@ public class Build {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.

44
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1888,8 +1888,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -1941,8 +1941,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -2010,8 +2010,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -2088,8 +2088,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -2126,8 +2126,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -2210,8 +2210,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -2247,8 +2247,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -3853,8 +3853,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -3891,8 +3891,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -4145,8 +4145,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.
@@ -4184,8 +4184,8 @@ public class TelephonyManager {
*
* <p>Starting with API level 29, persistent device identifiers are guarded behind additional
* restrictions, and apps are recommended to use resettable identifiers (see <a
* href="c"> Best practices for unique identifiers</a>). This method can be invoked if one of
* the following requirements is met:
* href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This
* method can be invoked if one of the following requirements is met:
* <ul>
* <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this
* is a privileged permission that can only be granted to apps preloaded on the device.