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

am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones

Browse Source 
* commit 'd104aae8154ae182d58fc4c2b85fabbbe152faca':
  Skip over directories when iterating tombstones
This commit is contained in:
Patrick Tjin
2014-10-02 12:38:44 +00:00
committed by Android Git Automerger
parent 9ab7d0a736 d104aae815
commit 21b0fc91e0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/server/BootReceiver.java
View File

@@ -155,8 +155,10 @@ public class BootReceiver extends BroadcastReceiver {
// Scan existing tombstones (in case any new ones appeared) // Scan existing tombstones (in case any new ones appeared)
File[] tombstoneFiles = TOMBSTONE_DIR.listFiles(); File[] tombstoneFiles = TOMBSTONE_DIR.listFiles();
for (int i = 0; tombstoneFiles != null && i < tombstoneFiles.length; i++) { for (int i = 0; tombstoneFiles != null && i < tombstoneFiles.length; i++) {
addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(), if (tombstoneFiles[i].isFile()) {
LOG_SIZE, "SYSTEM_TOMBSTONE"); addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(),
LOG_SIZE, "SYSTEM_TOMBSTONE");
}
} }
// Start watching for new tombstone files; will record them as they occur. // Start watching for new tombstone files; will record them as they occur.
@@ -165,8 +167,10 @@ public class BootReceiver extends BroadcastReceiver {
@Override @Override
public void onEvent(int event, String path) { public void onEvent(int event, String path) {
try { try {
String filename = new File(TOMBSTONE_DIR, path).getPath(); File file = new File(TOMBSTONE_DIR, path);
addFileToDropBox(db, prefs, headers, filename, LOG_SIZE, "SYSTEM_TOMBSTONE"); if (file.isFile()) {
addFileToDropBox(db, prefs, headers, file.getPath(), LOG_SIZE, "SYSTEM_TOMBSTONE");
}
} catch (IOException e) { } catch (IOException e) {
Slog.e(TAG, "Can't log tombstone", e); Slog.e(TAG, "Can't log tombstone", e);
} }