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

Commit 504b2dd5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix unique identifiers best practices links in device ID API docs" into rvc-qpr-dev

parents b742bfe9 1aef206a

core/java/android/os/Build.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -135,8 +135,8 @@ public class Build { 
     *

     *

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     is a privileged permission that can only be granted to apps preloaded on the device.

telephony/java/android/telephony/TelephonyManager.java

+22 −22
Original line number Original line Diff line number Diff line
@@ -1888,8 +1888,8 @@ public class TelephonyManager { 
     *

     *

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     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

     * <p>Starting with API level 29, persistent device identifiers are guarded behind additional

     * restrictions, and apps are recommended to use resettable identifiers (see <a

     * 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

     * href="/training/articles/user-data-ids">Best practices for unique identifiers</a>). This

     * the following requirements is met:

     * method can be invoked if one of the following requirements is met:

     * <ul>

     * <ul>

     *     <li>If the calling app has been granted the READ_PRIVILEGED_PHONE_STATE permission; this

     *     <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.

     *     is a privileged permission that can only be granted to apps preloaded on the device.