summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-11-12 10:05:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-12 10:05:30 -0800
commit4ee6d87e16ed0e12db7cb07c8cf3b09ef4eeb525 (patch)
treed6353bce015b7677d2d04a0e2b5f8babe2e1dfb0 /core/java
parentde558603dc81237dc3e94cf463c1d9884bef03e9 (diff)
parent3c95033a3854c6d569a8c8849e06298fc842498d (diff)
am 3c95033a: am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
* commit '3c95033a3854c6d569a8c8849e06298fc842498d': clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a960bba87c66..0dffc17bda12 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3252,9 +3252,14 @@ public final class Settings {
/**
* A 64-bit number (as a hex string) that is randomly
- * generated on the device's first boot and should remain
- * constant for the lifetime of the device. (The value may
- * change if a factory reset is performed on the device.)
+ * generated when the user first sets up the device and should remain
+ * constant for the lifetime of the user's device. The value may
+ * change if a factory reset is performed on the device.
+ * <p class="note"><strong>Note:</strong> When a device has <a
+ * href="{@docRoot}about/versions/android-4.2.html#MultipleUsers">multiple users</a>
+ * (available on certain devices running Android 4.2 or higher), each user appears as a
+ * completely separate device, so the {@code ANDROID_ID} value is unique to each
+ * user.</p>
*/
public static final String ANDROID_ID = "android_id";