diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-02-25 15:55:37 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2013-02-25 15:55:37 -0800 |
commit | 45e9ede55f3c5049fed1fc5002bd5084d1cd7eac (patch) | |
tree | 0c21d7b622f7b57e19319d20076d0c9e41cc17e3 | |
parent | f4b36ad1617920691def64c00179666e2e42d5fa (diff) | |
download | frameworks_base-45e9ede55f3c5049fed1fc5002bd5084d1cd7eac.zip frameworks_base-45e9ede55f3c5049fed1fc5002bd5084d1cd7eac.tar.gz frameworks_base-45e9ede55f3c5049fed1fc5002bd5084d1cd7eac.tar.bz2 |
Add version code constant for JB MR2.
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | core/java/android/net/TrafficStats.java | 24 | ||||
-rw-r--r-- | core/java/android/os/Build.java | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/api/current.txt b/api/current.txt index b510704..86353d1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15849,7 +15849,7 @@ package android.os { field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf field public static final int JELLY_BEAN = 16; // 0x10 field public static final int JELLY_BEAN_MR1 = 17; // 0x11 - field public static final int K = 10000; // 0x2710 + field public static final int JELLY_BEAN_MR2 = 10000; // 0x2710 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index a282910..ce1276f 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -429,7 +429,7 @@ public class TrafficStats { * monotonically since device boot. Statistics are measured at the network * layer, so they include both TCP and UDP usage. * <p> - * Before {@link android.os.Build.VERSION_CODES#K}, this may return + * Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return * {@link #UNSUPPORTED} on devices where statistics aren't available. * * @see android.os.Process#myUid() @@ -445,7 +445,7 @@ public class TrafficStats { * monotonically since device boot. Statistics are measured at the network * layer, so they include both TCP and UDP usage. * <p> - * Before {@link android.os.Build.VERSION_CODES#K}, this may return + * Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return * {@link #UNSUPPORTED} on devices where statistics aren't available. * * @see android.os.Process#myUid() @@ -461,7 +461,7 @@ public class TrafficStats { * monotonically since device boot. Statistics are measured at the network * layer, so they include both TCP and UDP usage. * <p> - * Before {@link android.os.Build.VERSION_CODES#K}, this may return + * Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return * {@link #UNSUPPORTED} on devices where statistics aren't available. * * @see android.os.Process#myUid() @@ -477,7 +477,7 @@ public class TrafficStats { * monotonically since device boot. Statistics are measured at the network * layer, so they include both TCP and UDP usage. * <p> - * Before {@link android.os.Build.VERSION_CODES#K}, this may return + * Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return * {@link #UNSUPPORTED} on devices where statistics aren't available. * * @see android.os.Process#myUid() @@ -488,7 +488,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidTxBytes(int) @@ -499,7 +499,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidRxBytes(int) @@ -510,7 +510,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidTxBytes(int) @@ -521,7 +521,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidRxBytes(int) @@ -532,7 +532,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidTxPackets(int) @@ -543,7 +543,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidRxPackets(int) @@ -554,7 +554,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidTxPackets(int) @@ -565,7 +565,7 @@ public class TrafficStats { } /** - * @deprecated Starting in {@link android.os.Build.VERSION_CODES#K}, + * @deprecated Starting in {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, * transport layer statistics are no longer available, and will * always return {@link #UNSUPPORTED}. * @see #getUidRxPackets(int) diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 52c89e8..97ac862 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -433,9 +433,9 @@ public class Build { public static final int JELLY_BEAN_MR1 = 17; /** - * Android X.X: "K". Just "K" + * Android 4.X: Jelly Bean MR2, the revenge of the beans. */ - public static final int K = CUR_DEVELOPMENT; + public static final int JELLY_BEAN_MR2 = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */ |