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

Merge "Only full-data back up regular files + directories" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-13 21:06:56 +00:00
committed by Android (Google) Code Review
parent 33e56a9e1f da2018efeb
commit b3ca7c26e1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/backup/BackupAgent.java
View File

@@ -649,10 +649,11 @@ public abstract class BackupAgent extends ContextWrapper {
File file = scanQueue.remove(0); File file = scanQueue.remove(0);
String filePath; String filePath;
try { try {
// Ignore symlinks outright // Ignore things that aren't "real" files or dirs
StructStat stat = Os.lstat(file.getPath()); StructStat stat = Os.lstat(file.getPath());
if (OsConstants.S_ISLNK(stat.st_mode)) { if (!OsConstants.S_ISREG(stat.st_mode)
if (DEBUG) Log.i(TAG, "Symlink (skipping)!: " + file); && !OsConstants.S_ISDIR(stat.st_mode)) {
if (DEBUG) Log.i(TAG, "Not a file/dir (skipping)!: " + file);
continue; continue;
} }