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

am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo

Browse Source 
Merge commit 'a68780dd0f0af0938b72fdf6539db575da471028' into kraken

* commit 'a68780dd0f0af0938b72fdf6539db575da471028':
  Roaming data doesn't count against limits
This commit is contained in:
Robert Greenwalt
2010-04-09 09:35:55 -07:00
committed by Android Git Automerger
parent 2dc3da60c4 a68780dd0f
commit 061cd6e322
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/ThrottleService.java
View File

@@ -44,6 +44,8 @@ import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.util.Slog; import android.util.Slog;
import com.android.internal.telephony.TelephonyProperties;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Calendar; import java.util.Calendar;
@@ -319,15 +321,19 @@ public class ThrottleService extends IThrottleManager.Stub {
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "got remoteException in onPollAlarm:" + e); Slog.e(TAG, "got remoteException in onPollAlarm:" + e);
} }
// don't count this data if we're roaming.
mRecorder.addData(incRead, incWrite); boolean roaming = "true".equals(
SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_ISROAMING));
if (!roaming) {
mRecorder.addData(incRead, incWrite);
}
long periodRx = mRecorder.getPeriodRx(0); long periodRx = mRecorder.getPeriodRx(0);
long periodTx = mRecorder.getPeriodTx(0); long periodTx = mRecorder.getPeriodTx(0);
long total = periodRx + periodTx; long total = periodRx + periodTx;
if (DBG) { if (DBG) {
Slog.d(TAG, "onPollAlarm - now =" + now + ", read =" + incRead + Slog.d(TAG, "onPollAlarm - now =" + now + ", roaming =" + roaming +
", written =" + incWrite + ", new total =" + total); ", read =" + incRead + ", written =" + incWrite + ", new total =" + total);
} }
mLastRead += incRead; mLastRead += incRead;
mLastWrite += incWrite; mLastWrite += incWrite;
@@ -686,12 +692,6 @@ public class ThrottleService extends IThrottleManager.Stub {
} }
long getPeriodRx(int which) { long getPeriodRx(int which) {
if (DBG) { // TODO - remove
Slog.d(TAG, "reading slot "+ which +" with current =" + mCurrentPeriod);
for(int x = 0; x<mPeriodCount; x++) {
Slog.d(TAG, " " + x + " = " + mPeriodRxData[x]);
}
}
synchronized (mParent) { synchronized (mParent) {
if (which > mPeriodCount) return 0; if (which > mPeriodCount) return 0;
which = mCurrentPeriod - which; which = mCurrentPeriod - which;