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

Commit 11be5c62 authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge "Fix unique identifiers best practices links in device ID API docs"

parents 7a920a8c 17b4bbd2

core/java/android/os/Build.java

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,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.

telephony/java/android/telephony/TelephonyManager.java

+22 −22
Original line number 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

     * 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.
@@ -3723,8 +3723,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.
@@ -3761,8 +3761,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.
@@ -4015,8 +4015,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.
@@ -4054,8 +4054,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.