diff options
Diffstat (limited to 'services/usage/java/com/android/server/usage/UsageStatsXml.java')
-rw-r--r-- | services/usage/java/com/android/server/usage/UsageStatsXml.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/services/usage/java/com/android/server/usage/UsageStatsXml.java b/services/usage/java/com/android/server/usage/UsageStatsXml.java index 9ce6d63..26148ce 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsXml.java +++ b/services/usage/java/com/android/server/usage/UsageStatsXml.java @@ -24,21 +24,26 @@ import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; public class UsageStatsXml { private static final String TAG = "UsageStatsXml"; private static final int CURRENT_VERSION = 1; private static final String USAGESTATS_TAG = "usagestats"; private static final String VERSION_ATTR = "version"; + private static final String CHECKED_IN_SUFFIX = "-c"; public static long parseBeginTime(AtomicFile file) { - return Long.parseLong(file.getBaseFile().getName()); + return parseBeginTime(file.getBaseFile()); + } + + public static long parseBeginTime(File file) { + final String name = file.getName(); + if (name.endsWith(CHECKED_IN_SUFFIX)) { + return Long.parseLong( + name.substring(0, name.length() - CHECKED_IN_SUFFIX.length())); + } + return Long.parseLong(name); } public static void read(AtomicFile file, IntervalStats statsOut) throws IOException { |