diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-24 10:41:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 10:41:46 +0000 |
| commit | 4400f96d1f52679801a6c49175c806fb30c83768 (patch) | |
| tree | dd2513e05dba3604111a4b9dcca4b2823b6bd479 /core/java | |
| parent | f8f4d78d1266fabf0f729e644f9f4a607d829150 (diff) | |
| parent | a021e922184ee16fc019e29c066719daa793dd2b (diff) | |
| download | frameworks_base-4400f96d1f52679801a6c49175c806fb30c83768.zip frameworks_base-4400f96d1f52679801a6c49175c806fb30c83768.tar.gz frameworks_base-4400f96d1f52679801a6c49175c806fb30c83768.tar.bz2 | |
am a021e922: resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
* commit 'a021e922184ee16fc019e29c066719daa793dd2b':
Deprecating FloatMath and Time
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/text/format/Time.java | 3 | ||||
| -rw-r--r-- | core/java/android/util/FloatMath.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java index 3c90ab6..0c66709 100644 --- a/core/java/android/text/format/Time.java +++ b/core/java/android/text/format/Time.java @@ -48,7 +48,10 @@ import libcore.util.ZoneInfoDB; * <li>Much of the formatting / parsing assumes ASCII text and is therefore not suitable for * use with non-ASCII scripts.</li> * </ul> + * + * @deprecated Use {@link java.util.GregorianCalendar} instead. */ +@Deprecated public class Time { private static final String Y_M_D_T_H_M_S_000 = "%Y-%m-%dT%H:%M:%S.000"; private static final String Y_M_D_T_H_M_S_000_Z = "%Y-%m-%dT%H:%M:%S.000Z"; diff --git a/core/java/android/util/FloatMath.java b/core/java/android/util/FloatMath.java index 90e0636..8f488af 100644 --- a/core/java/android/util/FloatMath.java +++ b/core/java/android/util/FloatMath.java @@ -24,7 +24,10 @@ package android.util; * became slower and have since been re-implemented to wrap calls to * {@link java.lang.Math}. {@link java.lang.Math} should be used in * preference. + * + * @deprecated Use {@link java.lang.Math} instead. */ +@Deprecated public class FloatMath { /** Prevents instantiation. */ |