summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Tate <ctate@android.com> 2009-09-21 19:36:51 -0700
committer Christopher Tate <ctate@android.com> 2009-09-24 11:19:04 -0700
commit6e472890effc63430d0ab680051c10cf2cf3cdbe (patch)
tree54d32dd895bf9080b7f6aaf58acee76dc4ed5431
parent601500bb2ca52de6f251d0bc44213392c1756e7b (diff)
Clear the device's data from the transport when backup is disabled
Turning off backup in the Settings UI constitutes an opt-out of the whole mechanism. For privacy reasons we instruct the backend to wipe all of the data belonging to this device when the user does this. If the attempt fails it is rescheduled in the future based on the transport's requestBackupTime() suggestion. If network connectivity changes prompt the transport to indicate a backup pass is appropriate "now," any pending init operation is processed before the backup schedule is resumed. The broadcasts used internally to the backup manager are now fully protected; third party apps can neither send nor receive them. (Also a minor logging change; don't log 'appropriate' EOF encountered during parsing of a backup data stream.)
-rw-r--r--libs/utils/BackupData.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp
index 0cef35aed5..2535094a89 100644
--- a/libs/utils/BackupData.cpp
+++ b/libs/utils/BackupData.cpp
@@ -196,8 +196,9 @@ BackupDataReader::Status()
m_done = true; \
} else { \
m_status = errno; \
+ LOGD("CHECK_SIZE(a=%ld e=%ld) failed at line %d m_status='%s'", \
+ long(actual), long(expected), __LINE__, strerror(m_status)); \
} \
- LOGD("CHECK_SIZE failed with at line %d m_status='%s'", __LINE__, strerror(m_status)); \
return m_status; \
} \
} while(0)