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

Commit 59b684a1 authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS" am: 9709f513 am: 40d78c5b 

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

Change-Id: Ia931bb6390c9de4a2777a618ce40f5ce66ba3875
parents 3a94d504 40d78c5b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/net/VpnManager.java

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