diff options
| author | 2022-02-28 15:46:08 +0000 | |
|---|---|---|
| committer | 2022-02-28 15:46:08 +0000 | |
| commit | 40d78c5b05cc76e6972d018e4d31ce4a38ce28a2 (patch) | |
| tree | f7a60958c683584e0e11581f596d3e951d3f7fbf | |
| parent | 7e16f6e837d1304f83ee6a039dd9434f7b13ff5b (diff) | |
| parent | 9709f513c12ee021fc56b3164a078911bac2bcca (diff) | |
Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS" am: 9709f513c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000591
Change-Id: Id203866cc123209ac5a7c68f8b4822953fde307e
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/VpnManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index a6a8ec0b3e93..9eeb80edc372 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -25524,7 +25524,7 @@ package android.net { field public static final String EXTRA_ERROR_CLASS = "android.net.extra.ERROR_CLASS"; field public static final String EXTRA_ERROR_CODE = "android.net.extra.ERROR_CODE"; field public static final String EXTRA_SESSION_KEY = "android.net.extra.SESSION_KEY"; - field public static final String EXTRA_TIMESTAMP = "android.net.extra.TIMESTAMP"; + field public static final String EXTRA_TIMESTAMP_MILLIS = "android.net.extra.TIMESTAMP_MILLIS"; field public static final String EXTRA_UNDERLYING_LINK_PROPERTIES = "android.net.extra.UNDERLYING_LINK_PROPERTIES"; field public static final String EXTRA_UNDERLYING_NETWORK = "android.net.extra.UNDERLYING_NETWORK"; field public static final String EXTRA_UNDERLYING_NETWORK_CAPABILITIES = "android.net.extra.UNDERLYING_NETWORK_CAPABILITIES"; diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java index 779d931245c8..c51444cd31b6 100644 --- a/core/java/android/net/VpnManager.java +++ b/core/java/android/net/VpnManager.java @@ -108,7 +108,7 @@ public class VpnManager { * <ul> * <li>{@link #EXTRA_SESSION_KEY}, a {@code String} for the session key, as returned by * {@link #startProvisionedVpnProfileSession}. - * <li>{@link #EXTRA_TIMESTAMP}, a long for the timestamp at which the error occurred, + * <li>{@link #EXTRA_TIMESTAMP_MILLIS}, a long for the timestamp at which the error occurred, * in milliseconds since the epoch, as returned by * {@link java.lang.System#currentTimeMillis}. * <li>{@link #EXTRA_UNDERLYING_NETWORK}, a {@link Network} containing the underlying @@ -196,7 +196,7 @@ public class VpnManager { * This is a number of milliseconds since the epoch, suitable to be compared with * {@link java.lang.System#currentTimeMillis}. */ - public static final String EXTRA_TIMESTAMP = "android.net.extra.TIMESTAMP"; + public static final String EXTRA_TIMESTAMP_MILLIS = "android.net.extra.TIMESTAMP_MILLIS"; /** * Extra for the error class, as an {@code int}. |