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

Merge change 6426 into donut

Browse Source 
* changes:
  Remove a lot of debug-log verbosity
This commit is contained in:
Android (Google) Code Review
2009-07-07 16:37:29 -07:00
parent 86ea435a40 22b60d8fd0
commit 7b68a408e9
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1181,8 +1181,6 @@ class BackupManagerService extends IBackupManager.Stub {
// may share a uid, we need to note all candidates within that uid and schedule // may share a uid, we need to note all candidates within that uid and schedule
// a backup pass for each of them. // a backup pass for each of them.
Log.d(TAG, "dataChanged packageName=" + packageName);
// If the caller does not hold the BACKUP permission, it can only request a // If the caller does not hold the BACKUP permission, it can only request a
// backup of its own data. // backup of its own data.
HashSet<ApplicationInfo> targets; HashSet<ApplicationInfo> targets;
@@ -1192,7 +1190,6 @@ class BackupManagerService extends IBackupManager.Stub {
} else { } else {
// a caller with full permission can ask to back up any participating app // a caller with full permission can ask to back up any participating app
// !!! TODO: allow backup of ANY app? // !!! TODO: allow backup of ANY app?
if (DEBUG) Log.v(TAG, "Privileged caller, allowing backup of other apps");
targets = new HashSet<ApplicationInfo>(); targets = new HashSet<ApplicationInfo>();
int N = mBackupParticipants.size(); int N = mBackupParticipants.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
@@ -1217,20 +1214,20 @@ class BackupManagerService extends IBackupManager.Stub {
// operation returned null when this package was not already // operation returned null when this package was not already
// in the set; we want to avoid touching the disk redundantly. // in the set; we want to avoid touching the disk redundantly.
writeToJournalLocked(packageName); writeToJournalLocked(packageName);
}
}
}
if (DEBUG) { if (DEBUG) {
int numKeys = mPendingBackups.size(); int numKeys = mPendingBackups.size();
Log.d(TAG, "Now awaiting backup for " + numKeys + " participants:"); Log.d(TAG, "Now awaiting backup for " + numKeys + " participants:");
for (BackupRequest b : mPendingBackups.values()) { for (BackupRequest b : mPendingBackups.values()) {
Log.d(TAG, " + " + b + " agent=" + b.appInfo.backupAgentName); Log.d(TAG, " + " + b + " agent=" + b.appInfo.backupAgentName);
}
}
}
} }
} }
} }
} else { } else {
Log.w(TAG, "dataChanged but no participant pkg " + packageName); Log.w(TAG, "dataChanged but no participant pkg='" + packageName + "'");
} }
} }