Only shows roaming disconnect notificaiton once
If data connection is not allowed due to data roaming
not enabled, we should only show the notification once
before data is connected again.
Fixed by reverting part of ag/2163254.
Test: Telephony sanity tests
bug: 38279959
Change-Id: I423063809e8814817b53ef97a0bd53df04cfc043
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 39937eb..68043c0 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -145,6 +145,8 @@
private Activity mPUKEntryActivity;
private ProgressDialog mPUKEntryProgressDialog;
+ private boolean mDataDisconnectedDueToRoaming = false;
+
private WakeState mWakeState = WakeState.SLEEP;
private PowerManager mPowerManager;
@@ -671,16 +673,21 @@
// The "data disconnected due to roaming" notification is shown
// if (a) you have the "data roaming" feature turned off, and
// (b) you just lost data connectivity because you're roaming.
- if (PhoneConstants.DataState.DISCONNECTED.name().equals(state)
+ // (c) if we haven't shown the notification for this disconnection earlier.
+ if (!mDataDisconnectedDueToRoaming
+ && PhoneConstants.DataState.DISCONNECTED.name().equals(state)
&& Phone.REASON_ROAMING_ON.equals(reason)
&& !phone.getDataRoamingEnabled()) {
// Notify the user that data call is disconnected due to roaming. Note that
// calling this multiple times will not cause multiple notifications.
mHandler.sendEmptyMessage(EVENT_DATA_ROAMING_DISCONNECTED);
- } else if (PhoneConstants.DataState.CONNECTED.name().equals(state)) {
+ mDataDisconnectedDueToRoaming = true;
+ } else if (mDataDisconnectedDueToRoaming
+ && PhoneConstants.DataState.CONNECTED.name().equals(state)) {
// Cancel the notification when data is available. Note it is okay to call this
// even if the notification doesn't exist.
mHandler.sendEmptyMessage(EVENT_DATA_ROAMING_OK);
+ mDataDisconnectedDueToRoaming = false;
}
} else if ((action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) &&
(mPUKEntryActivity != null)) {