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

Merge change 26053 into eclair

Browse Source 
* changes:
  log hash of account name in sync event log
This commit is contained in:
Android (Google) Code Review
2009-09-21 12:21:14 -04:00
parent a953ed4bc0 44f5747815
commit e256c79731
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/content/SyncManager.java
View File

@@ -514,7 +514,7 @@ class SyncManager implements OnAccountsUpdatedListener {
public SyncStorageEngine getSyncStorageEngine() { public SyncStorageEngine getSyncStorageEngine() {
return mSyncStorageEngine; return mSyncStorageEngine;
} }
private void ensureAlarmService() { private void ensureAlarmService() {
if (mAlarmService == null) { if (mAlarmService == null) {
mAlarmService = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE); mAlarmService = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
@@ -1125,7 +1125,7 @@ class SyncManager implements OnAccountsUpdatedListener {
tobj.set(time); tobj.set(time);
return tobj.format("%Y-%m-%d %H:%M:%S"); return tobj.format("%Y-%m-%d %H:%M:%S");
} }
protected void dumpSyncState(PrintWriter pw, StringBuilder sb) { protected void dumpSyncState(PrintWriter pw, StringBuilder sb) {
pw.print("sync enabled: "); pw.println(isSyncEnabled()); pw.print("sync enabled: "); pw.println(isSyncEnabled());
pw.print("data connected: "); pw.println(mDataConnectionIsConnected); pw.print("data connected: "); pw.println(mDataConnectionIsConnected);
@@ -1219,13 +1219,13 @@ class SyncManager implements OnAccountsUpdatedListener {
= mSyncStorageEngine.getAuthority(status.authorityId); = mSyncStorageEngine.getAuthority(status.authorityId);
if (authority != null) { if (authority != null) {
Account curAccount = authority.account; Account curAccount = authority.account;
if (processedAccounts.contains(curAccount)) { if (processedAccounts.contains(curAccount)) {
continue; continue;
} }
processedAccounts.add(curAccount); processedAccounts.add(curAccount);
pw.print(" Account "); pw.print(authority.account.name); pw.print(" Account "); pw.print(authority.account.name);
pw.print(" "); pw.print(authority.account.type); pw.print(" "); pw.print(authority.account.type);
pw.println(":"); pw.println(":");
@@ -1271,7 +1271,7 @@ class SyncManager implements OnAccountsUpdatedListener {
pw.print(time/1000); pw.print('.'); pw.print((time/100)%10); pw.print(time/1000); pw.print('.'); pw.print((time/100)%10);
pw.print('s'); pw.print('s');
} }
private void dumpDayStatistic(PrintWriter pw, SyncStorageEngine.DayStats ds) { private void dumpDayStatistic(PrintWriter pw, SyncStorageEngine.DayStats ds) {
pw.print("Success ("); pw.print(ds.successCount); pw.print("Success ("); pw.print(ds.successCount);
if (ds.successCount > 0) { if (ds.successCount > 0) {
@@ -1285,7 +1285,7 @@ class SyncManager implements OnAccountsUpdatedListener {
} }
pw.println(")"); pw.println(")");
} }
protected void dumpSyncHistory(PrintWriter pw, StringBuilder sb) { protected void dumpSyncHistory(PrintWriter pw, StringBuilder sb) {
SyncStorageEngine.DayStats dses[] = mSyncStorageEngine.getDayStatistics(); SyncStorageEngine.DayStats dses[] = mSyncStorageEngine.getDayStatistics();
if (dses != null && dses[0] != null) { if (dses != null && dses[0] != null) {
@@ -1295,18 +1295,18 @@ class SyncManager implements OnAccountsUpdatedListener {
int today = dses[0].day; int today = dses[0].day;
int i; int i;
SyncStorageEngine.DayStats ds; SyncStorageEngine.DayStats ds;
// Print each day in the current week. // Print each day in the current week.
for (i=1; i<=6 && i < dses.length; i++) { for (i=1; i<=6 && i < dses.length; i++) {
ds = dses[i]; ds = dses[i];
if (ds == null) break; if (ds == null) break;
int delta = today-ds.day; int delta = today-ds.day;
if (delta > 6) break; if (delta > 6) break;
pw.print(" Day-"); pw.print(delta); pw.print(": "); pw.print(" Day-"); pw.print(delta); pw.print(": ");
dumpDayStatistic(pw, ds); dumpDayStatistic(pw, ds);
} }
// Aggregate all following days into weeks and print totals. // Aggregate all following days into weeks and print totals.
int weekDay = today; int weekDay = today;
while (i < dses.length) { while (i < dses.length) {
@@ -1321,7 +1321,7 @@ class SyncManager implements OnAccountsUpdatedListener {
int delta = weekDay-ds.day; int delta = weekDay-ds.day;
if (delta > 6) break; if (delta > 6) break;
i++; i++;
if (aggr == null) { if (aggr == null) {
aggr = new SyncStorageEngine.DayStats(weekDay); aggr = new SyncStorageEngine.DayStats(weekDay);
} }
@@ -1336,7 +1336,7 @@ class SyncManager implements OnAccountsUpdatedListener {
} }
} }
} }
ArrayList<SyncStorageEngine.SyncHistoryItem> items ArrayList<SyncStorageEngine.SyncHistoryItem> items
= mSyncStorageEngine.getSyncHistory(); = mSyncStorageEngine.getSyncHistory();
if (items != null && items.size() > 0) { if (items != null && items.size() > 0) {
@@ -2132,7 +2132,8 @@ class SyncManager implements OnAccountsUpdatedListener {
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
EventLog.writeEvent(2720, syncOperation.authority, EventLog.writeEvent(2720, syncOperation.authority,
SyncStorageEngine.EVENT_START, source); SyncStorageEngine.EVENT_START, source,
syncOperation.account.name.hashCode());
return mSyncStorageEngine.insertStartSyncEvent( return mSyncStorageEngine.insertStartSyncEvent(
syncOperation.account, syncOperation.authority, now, source); syncOperation.account, syncOperation.authority, now, source);
@@ -2141,7 +2142,8 @@ class SyncManager implements OnAccountsUpdatedListener {
public void stopSyncEvent(long rowId, SyncOperation syncOperation, String resultMessage, public void stopSyncEvent(long rowId, SyncOperation syncOperation, String resultMessage,
int upstreamActivity, int downstreamActivity, long elapsedTime) { int upstreamActivity, int downstreamActivity, long elapsedTime) {
EventLog.writeEvent(2720, syncOperation.authority, EventLog.writeEvent(2720, syncOperation.authority,
SyncStorageEngine.EVENT_STOP, syncOperation.syncSource); SyncStorageEngine.EVENT_STOP, syncOperation.syncSource,
syncOperation.account.name.hashCode());
mSyncStorageEngine.stopSyncEvent(rowId, elapsedTime, resultMessage, mSyncStorageEngine.stopSyncEvent(rowId, elapsedTime, resultMessage,
downstreamActivity, upstreamActivity); downstreamActivity, upstreamActivity);
@@ -2173,7 +2175,7 @@ class SyncManager implements OnAccountsUpdatedListener {
syncOperation.pendingOperation = op; syncOperation.pendingOperation = op;
add(syncOperation, op); add(syncOperation, op);
} }
if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */); if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */);
} }