diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-10-09 16:00:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-01-25 11:16:57 -0800 |
| commit | 81e9276a479fd3a5ccc3129505c0fb018941934b (patch) | |
| tree | adc9f1b8b1b90d52ceb063b193610a4aa6a4629c /api | |
| parent | 3df01599879e2bed32960911394fc9e2a8fcbc33 (diff) | |
| download | frameworks_base-81e9276a479fd3a5ccc3129505c0fb018941934b.zip frameworks_base-81e9276a479fd3a5ccc3129505c0fb018941934b.tar.gz frameworks_base-81e9276a479fd3a5ccc3129505c0fb018941934b.tar.bz2 | |
Added JELLY_BEAN version name; update some targetSdkVersion docs.
Change-Id: Ia38ff5b9ad2b63c2cf667260881222d9ff168052
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 8d6a135..a0f363c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6822,7 +6822,7 @@ package android.database { public abstract interface Cursor { method public abstract void close(); method public abstract void copyStringToBuffer(int, android.database.CharArrayBuffer); - method public abstract void deactivate(); + method public abstract deprecated void deactivate(); method public abstract byte[] getBlob(int); method public abstract int getColumnCount(); method public abstract int getColumnIndex(java.lang.String); @@ -14427,6 +14427,7 @@ package android.os { field public static final int HONEYCOMB_MR2 = 13; // 0xd field public static final int ICE_CREAM_SANDWICH = 14; // 0xe field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf + field public static final int JELLY_BEAN = 10000; // 0x2710 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { |