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

Commit 1d8a35f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unique identifiers best practices links in device ID API docs" am: 8b6aa74d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438023

Change-Id: Ife62d7150f8b52e1a7d1e7cb6332a70d9f86d6ac
parents 61fa631c 8b6aa74d

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
@@ -1884,8 +1884,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.
@@ -1937,8 +1937,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.
@@ -2006,8 +2006,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.
@@ -2084,8 +2084,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.
@@ -2122,8 +2122,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.
@@ -2206,8 +2206,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.
@@ -2243,8 +2243,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.
@@ -3719,8 +3719,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.
@@ -3757,8 +3757,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.
@@ -4011,8 +4011,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.
@@ -4050,8 +4050,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.