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

Merge change 9054

Browse Source 
* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().
This commit is contained in:
Android (Google) Code Review
2009-07-29 17:03:04 -07:00
parent 79ef673d56 6afac8b292
commit fc6627a892
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -77,7 +77,6 @@ public abstract class ServiceStateTracker extends Handler {
// waiting period before recheck gprs and voice registration
public static final int DEFAULT_GPRS_CHECK_PERIOD_MILLIS = 60 * 1000;
public static final int MAX_NUM_DATA_STATE_READS = 15;
public static final int DATA_STATE_POLL_SLEEP_MS = 100;
//*****GSM events

7
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -504,9 +504,10 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
msg.obj = CDMAPhone.REASON_RADIO_TURNED_OFF;
dcTracker.sendMessage(msg);
// Poll data state up to 15 times, with a 100ms delay
// totaling 1.5 sec. Normal data disable action will finish in 100ms.
for (int i = 0; i < MAX_NUM_DATA_STATE_READS; i++) {
// Poll data state up to 50 times, with a 100ms delay
// totaling 5 sec.
// TODO: change the 5 seconds wait from blocking to non-blocking.
for (int i = 0; i < 50; i++) {
DataConnectionTracker.State currentState = dcTracker.getState();
if (currentState != DataConnectionTracker.State.CONNECTED
&& currentState != DataConnectionTracker.State.DISCONNECTING) {

2
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -151,6 +151,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
static final int PS_NOTIFICATION = 888; //id to update and cancel PS restricted
static final int CS_NOTIFICATION = 999; //id to update and cancel CS restricted
static final int MAX_NUM_DATA_STATE_READS = 15;
private ContentObserver mAutoTimeObserver = new ContentObserver(new Handler()) {
@Override
public void onChange(boolean selfChange) {