summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-16 09:41:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-10 21:16:15 +0000
commitab9a19e38c685d0cb2952185af510322b26181a7 (patch)
tree79c848371d7056a84d9a068b3b33a0c3a37d7327 /core/java/android
parentbfa6ddd02d699f43915cba8027ab324d234b4836 (diff)
parentd9d0bb64e74d363a027d24e93ccb67e46fb256ba (diff)
downloadframeworks_base-ab9a19e38c685d0cb2952185af510322b26181a7.zip
frameworks_base-ab9a19e38c685d0cb2952185af510322b26181a7.tar.gz
frameworks_base-ab9a19e38c685d0cb2952185af510322b26181a7.tar.bz2
Merge "Remove some pointless code."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/TimeUtils.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java
index 33964a0..707edef 100644
--- a/core/java/android/util/TimeUtils.java
+++ b/core/java/android/util/TimeUtils.java
@@ -62,10 +62,7 @@ public class TimeUtils {
*/
public static TimeZone getTimeZone(int offset, boolean dst, long when, String country) {
TimeZone best = null;
-
- Resources r = Resources.getSystem();
- XmlResourceParser parser = r.getXml(com.android.internal.R.xml.time_zones_by_country);
- Date d = new Date(when);
+ final Date d = new Date(when);
TimeZone current = TimeZone.getDefault();
String currentName = current.getID();