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

resolved conflicts for merge of 368fdba4 to master

Browse Source 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
This commit is contained in:
Brad Fitzpatrick
2010-10-21 07:39:10 -07:00
parent a376d030a2 368fdba47a
commit 385a753dea
15 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/BackupManagerService.java
View File

@@ -664,11 +664,11 @@ class BackupManagerService extends IBackupManager.Stub {
// backup.
RandomAccessFile in = null;
try {
Slog.i(TAG, "Found stale backup journal, scheduling:");
Slog.i(TAG, "Found stale backup journal, scheduling");
in = new RandomAccessFile(f, "r");
while (true) {
String packageName = in.readUTF();
Slog.i(TAG, " + " + packageName);
Slog.i(TAG, " " + packageName);
dataChangedImpl(packageName);
}
} catch (EOFException e) {