Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add version code constant for JB MR2." into jb-mr2-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-02-25 23:56:38 +00:00
committed by Android (Google) Code Review
parent a2fcddd1e6 45e9ede55f
commit 035045f8bb
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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 {

24
core/java/android/net/TrafficStats.java
View File

@@ -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)

4
core/java/android/os/Build.java
View File

@@ -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". */