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

Merge "don't delete /cache/recovery/last_log on boot" into gingerbread

Browse Source
This commit is contained in:
Doug Zongker
2010-09-29 13:41:00 -07:00
committed by Android (Google) Code Review
parent a5c742bfd0 d059055fb3
commit 981dec695f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ public class RecoverySystem {
private static File RECOVERY_DIR = new File("/cache/recovery"); private static File RECOVERY_DIR = new File("/cache/recovery");
private static File COMMAND_FILE = new File(RECOVERY_DIR, "command"); private static File COMMAND_FILE = new File(RECOVERY_DIR, "command");
private static File LOG_FILE = new File(RECOVERY_DIR, "log"); private static File LOG_FILE = new File(RECOVERY_DIR, "log");
private static String LAST_LOG_FILENAME = "last_log";
// Length limits for reading files. // Length limits for reading files.
private static int LOG_FILE_MAX_LENGTH = 64 * 1024; private static int LOG_FILE_MAX_LENGTH = 64 * 1024;
@@ -399,9 +400,10 @@ public class RecoverySystem {
Log.e(TAG, "Error reading recovery log", e); Log.e(TAG, "Error reading recovery log", e);
} }
// Delete everything in RECOVERY_DIR // Delete everything in RECOVERY_DIR except LAST_LOG_FILENAME
String[] names = RECOVERY_DIR.list(); String[] names = RECOVERY_DIR.list();
for (int i = 0; names != null && i < names.length; i++) { for (int i = 0; names != null && i < names.length; i++) {
if (names[i].equals(LAST_LOG_FILENAME)) continue;
File f = new File(RECOVERY_DIR, names[i]); File f = new File(RECOVERY_DIR, names[i]);
if (!f.delete()) { if (!f.delete()) {
Log.e(TAG, "Can't delete: " + f); Log.e(TAG, "Can't delete: " + f);