Merge branch 'heads/android-14.0.0_r18' into 14-dev
This commit is contained in:
@@ -34,7 +34,7 @@ public class LauncherBackupAgent extends BackupAgent {
|
||||
// Remove old files which might contain obsolete attributes like idp_grid_name in shared
|
||||
// preference that will obstruct backup's attribute from writing to shared preferences.
|
||||
if (destination.delete()) {
|
||||
FileLog.d("LauncherBackupAgent", "Removed obsolete file: " + destination);
|
||||
FileLog.d(TAG, "onRestoreFile: Removed obsolete file " + destination);
|
||||
}
|
||||
super.onRestoreFile(data, size, destination, type, mode, mtime);
|
||||
}
|
||||
@@ -47,6 +47,7 @@ public class LauncherBackupAgent extends BackupAgent {
|
||||
|
||||
@Override
|
||||
public void onRestoreFinished() {
|
||||
FileLog.d(TAG, "onRestoreFinished: set pending for RestoreDbTask");
|
||||
RestoreDbTask.setPending(this);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user