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

am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2

Browse Source 
Merge commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf'

* commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf':
  Migration to TrafficStats.
This commit is contained in:
Ken Shirriff
2009-12-10 07:06:25 -08:00
committed by Android Git Automerger
parent 507ecd5306 d44c2f2c85
commit 630432e424
7 changed files with 49 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/content/AbstractThreadedSyncAdapter.java
View File

@@ -17,10 +17,10 @@
package android.content;
import android.accounts.Account;
import android.net.TrafficStats;
import android.os.Bundle;
import android.os.Process;
import android.os.NetStat;
import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException;
import android.util.EventLog;
@@ -157,8 +157,8 @@ public abstract class AbstractThreadedSyncAdapter {
SyncResult syncResult = new SyncResult();
int uid = Process.myUid();
mInitialTxBytes = NetStat.getUidTxBytes(uid);
mInitialRxBytes = NetStat.getUidRxBytes(uid);
mInitialTxBytes = TrafficStats.getUidTxBytes(uid);
mInitialRxBytes = TrafficStats.getUidRxBytes(uid);
ContentProviderClient provider = null;
try {
provider = mContext.getContentResolver().acquireContentProviderClient(mAuthority);
@@ -175,8 +175,8 @@ public abstract class AbstractThreadedSyncAdapter {
if (!isCanceled()) {
mSyncContext.onFinished(syncResult);
}
onLogSyncDetails(NetStat.getUidTxBytes(uid) - mInitialTxBytes,
NetStat.getUidRxBytes(uid) - mInitialRxBytes, syncResult);
onLogSyncDetails(TrafficStats.getUidTxBytes(uid) - mInitialTxBytes,
TrafficStats.getUidRxBytes(uid) - mInitialRxBytes, syncResult);
// synchronize so that the assignment will be seen by other threads
// that also synchronize accesses to mSyncThread
synchronized (mSyncThreadLock) {

20
core/java/android/content/TempProviderSyncAdapter.java
View File

@@ -1,9 +1,12 @@
package android.content;
import android.accounts.Account;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.database.SQLException;
import android.net.TrafficStats;
import android.os.Bundle;
import android.os.Debug;
import android.os.NetStat;
import android.os.Parcelable;
import android.os.Process;
import android.os.SystemProperties;
@@ -12,9 +15,6 @@ import android.util.Config;
import android.util.EventLog;
import android.util.Log;
import android.util.TimingLogger;
import android.accounts.Account;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import java.io.IOException;
@@ -203,8 +203,8 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
if (mProviderSyncStarted) mProvider.onSyncCanceled();
// We may lose the last few sync events when canceling. Oh well.
int uid = Process.myUid();
logSyncDetails(NetStat.getUidTxBytes(uid) - mInitialTxBytes,
NetStat.getUidRxBytes(uid) - mInitialRxBytes, mResult);
logSyncDetails(TrafficStats.getUidTxBytes(uid) - mInitialTxBytes,
TrafficStats.getUidRxBytes(uid) - mInitialRxBytes, mResult);
}
@Override
@@ -212,8 +212,8 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
Process.setThreadPriority(Process.myTid(),
Process.THREAD_PRIORITY_BACKGROUND);
int uid = Process.myUid();
mInitialTxBytes = NetStat.getUidTxBytes(uid);
mInitialRxBytes = NetStat.getUidRxBytes(uid);
mInitialTxBytes = TrafficStats.getUidTxBytes(uid);
mInitialRxBytes = TrafficStats.getUidRxBytes(uid);
try {
sync(mSyncContext, mAccount, mAuthority, mExtras);
} catch (SQLException e) {
@@ -222,8 +222,8 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
} finally {
mSyncThread = null;
if (!mIsCanceled) {
logSyncDetails(NetStat.getUidTxBytes(uid) - mInitialTxBytes,
NetStat.getUidRxBytes(uid) - mInitialRxBytes, mResult);
logSyncDetails(TrafficStats.getUidTxBytes(uid) - mInitialTxBytes,
TrafficStats.getUidRxBytes(uid) - mInitialRxBytes, mResult);
mSyncContext.onFinished(mResult);
}
}