Stop exposing reasons through phone state listener
The data connection reasons are implementation details
of telephony and should not be exposed externally. The
data connection fail cause, which is different from
reasons, are still available.
Test: Telephony sanity tests + unit tests
Bug: 73659459
Merged-In: Iae3659bdb35d2a52c289f4e58b3f975114a7a556
Change-Id: Iae3659bdb35d2a52c289f4e58b3f975114a7a556
(cherry picked from commit 82f7e0290c980c3b2b3204ea8a82ee3187732d60)
diff --git a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
index f048214..0617f56 100644
--- a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
+++ b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
@@ -153,13 +153,13 @@
}
@Override
- public void notifyDataConnection(Phone sender, String reason, String apnType,
- PhoneConstants.DataState state) {
- doNotifyDataConnection(sender, reason, apnType, state);
+ public void notifyDataConnection(Phone sender, String apnType,
+ PhoneConstants.DataState state) {
+ doNotifyDataConnection(sender, apnType, state);
}
- private void doNotifyDataConnection(Phone sender, String reason, String apnType,
- PhoneConstants.DataState state) {
+ private void doNotifyDataConnection(Phone sender, String apnType,
+ PhoneConstants.DataState state) {
int subId = sender.getSubId();
long dds = SubscriptionManager.getDefaultDataSubscriptionId();
if (DBG) log("subId = " + subId + ", DDS = " + dds);
@@ -184,7 +184,6 @@
mRegistry.notifyDataConnectionForSubscriber(subId,
PhoneConstantConversions.convertDataState(state),
sender.isDataAllowed(ApnSetting.getApnTypesBitmaskFromString(apnType)),
- reason,
sender.getActiveApnHost(apnType),
apnType,
linkProperties,
@@ -198,11 +197,11 @@
}
@Override
- public void notifyDataConnectionFailed(Phone sender, String reason, String apnType) {
+ public void notifyDataConnectionFailed(Phone sender, String apnType) {
int subId = sender.getSubId();
try {
if (mRegistry != null) {
- mRegistry.notifyDataConnectionFailedForSubscriber(subId, reason, apnType);
+ mRegistry.notifyDataConnectionFailedForSubscriber(subId, apnType);
}
} catch (RemoteException ex) {
// system process is dead
@@ -286,11 +285,11 @@
}
}
- public void notifyPreciseDataConnectionFailed(Phone sender, String reason, String apnType,
+ public void notifyPreciseDataConnectionFailed(Phone sender, String apnType,
String apn, String failCause) {
// FIXME: subId?
try {
- mRegistry.notifyPreciseDataConnectionFailed(reason, apnType, apn, failCause);
+ mRegistry.notifyPreciseDataConnectionFailed(apnType, apn, failCause);
} catch (RemoteException ex) {
// system process is dead
}
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index 8ad5612..5e08a0c 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -2207,20 +2207,19 @@
mNotifier.notifyMessageWaitingChanged(this);
}
- public void notifyDataConnection(String reason, String apnType,
- PhoneConstants.DataState state) {
- mNotifier.notifyDataConnection(this, reason, apnType, state);
+ public void notifyDataConnection(String apnType, PhoneConstants.DataState state) {
+ mNotifier.notifyDataConnection(this, apnType, state);
}
- public void notifyDataConnection(String reason, String apnType) {
- mNotifier.notifyDataConnection(this, reason, apnType, getDataConnectionState(apnType));
+ public void notifyDataConnection(String apnType) {
+ mNotifier.notifyDataConnection(this, apnType, getDataConnectionState(apnType));
}
- public void notifyDataConnection(String reason) {
+ public void notifyDataConnection() {
String types[] = getActiveApnTypes();
if (types != null) {
for (String apnType : types) {
- mNotifier.notifyDataConnection(this, reason, apnType,
+ mNotifier.notifyDataConnection(this, apnType,
getDataConnectionState(apnType));
}
}
@@ -3092,13 +3091,13 @@
public void notifyCallForwardingIndicator() {
}
- public void notifyDataConnectionFailed(String reason, String apnType) {
- mNotifier.notifyDataConnectionFailed(this, reason, apnType);
+ public void notifyDataConnectionFailed(String apnType) {
+ mNotifier.notifyDataConnectionFailed(this, apnType);
}
- public void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn,
+ public void notifyPreciseDataConnectionFailed(String apnType, String apn,
String failCause) {
- mNotifier.notifyPreciseDataConnectionFailed(this, reason, apnType, apn, failCause);
+ mNotifier.notifyPreciseDataConnectionFailed(this, apnType, apn, failCause);
}
/**
diff --git a/src/java/com/android/internal/telephony/PhoneNotifier.java b/src/java/com/android/internal/telephony/PhoneNotifier.java
index e66f537..397aff7 100644
--- a/src/java/com/android/internal/telephony/PhoneNotifier.java
+++ b/src/java/com/android/internal/telephony/PhoneNotifier.java
@@ -29,40 +29,38 @@
*/
public interface PhoneNotifier {
- public void notifyPhoneState(Phone sender);
+ void notifyPhoneState(Phone sender);
- public void notifyServiceState(Phone sender);
+ void notifyServiceState(Phone sender);
/** Notify registrants of the current CellLocation */
void notifyCellLocation(Phone sender, CellLocation cl);
- public void notifySignalStrength(Phone sender);
+ void notifySignalStrength(Phone sender);
- public void notifyMessageWaitingChanged(Phone sender);
+ void notifyMessageWaitingChanged(Phone sender);
- public void notifyCallForwardingChanged(Phone sender);
+ void notifyCallForwardingChanged(Phone sender);
- /** TODO - reason should never be null */
- public void notifyDataConnection(Phone sender, String reason, String apnType,
- PhoneConstants.DataState state);
+ void notifyDataConnection(Phone sender, String apnType, PhoneConstants.DataState state);
- public void notifyDataConnectionFailed(Phone sender, String reason, String apnType);
+ void notifyDataConnectionFailed(Phone sender, String apnType);
- public void notifyDataActivity(Phone sender);
+ void notifyDataActivity(Phone sender);
- public void notifyOtaspChanged(Phone sender, int otaspMode);
+ void notifyOtaspChanged(Phone sender, int otaspMode);
- public void notifyCellInfo(Phone sender, List<CellInfo> cellInfo);
+ void notifyCellInfo(Phone sender, List<CellInfo> cellInfo);
/** Notify of change to PhysicalChannelConfiguration. */
void notifyPhysicalChannelConfiguration(Phone sender, List<PhysicalChannelConfig> configs);
- public void notifyPreciseCallState(Phone sender);
+ void notifyPreciseCallState(Phone sender);
- public void notifyDisconnectCause(int cause, int preciseCause);
+ void notifyDisconnectCause(int cause, int preciseCause);
- public void notifyPreciseDataConnectionFailed(Phone sender, String reason, String apnType,
- String apn, String failCause);
+ void notifyPreciseDataConnectionFailed(Phone sender, String apnType, String apn,
+ String failCause);
/** send a notification that the SRVCC state has changed.*/
void notifySrvccStateChanged(Phone sender, @TelephonyManager.SrvccState int state);
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 6dc28b5..f86268a 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -3062,7 +3062,7 @@
}
if (hasCssIndicatorChanged) {
- mPhone.notifyDataConnection(Phone.REASON_CSS_INDICATOR_CHANGED);
+ mPhone.notifyDataConnection();
}
mReasonDataDenied = mNewReasonDataDenied;
@@ -3199,13 +3199,7 @@
if (hasDataRegStateChanged || hasRilDataRadioTechnologyChanged) {
notifyDataRegStateRilRadioTechnologyChanged();
-
- if (ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
- == mSS.getRilDataRadioTechnology()) {
- mPhone.notifyDataConnection(Phone.REASON_IWLAN_AVAILABLE);
- } else {
- mPhone.notifyDataConnection(null);
- }
+ mPhone.notifyDataConnection();
}
if (hasVoiceRoamingOn || hasVoiceRoamingOff || hasDataRoamingOn || hasDataRoamingOff) {
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcController.java b/src/java/com/android/internal/telephony/dataconnection/DcController.java
index dddf8cd..d18d552 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcController.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcController.java
@@ -35,7 +35,6 @@
import com.android.internal.telephony.DctConstants;
import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
@@ -395,9 +394,7 @@
if (DBG) log("onDataStateChanged: simple change");
for (ApnContext apnContext : apnContexts) {
- mPhone.notifyDataConnection(
- PhoneConstants.REASON_LINK_PROPERTIES_CHANGED,
- apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
}
}
} else {
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 4ba8f55..289338f 100755
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -1088,7 +1088,7 @@
if (DBG) log ("onDataConnectionDetached: stop polling and notify detached");
stopNetStatPoll();
stopDataStallAlarm();
- notifyDataConnection(Phone.REASON_DATA_DETACHED);
+ notifyDataConnection();
mAttached.set(false);
}
@@ -1099,10 +1099,10 @@
if (DBG) log("onDataConnectionAttached: start polling notify attached");
startNetStatPoll();
startDataStallAlarm(DATA_STALL_NOT_SUSPECTED);
- notifyDataConnection(Phone.REASON_DATA_ATTACHED);
+ notifyDataConnection();
} else {
// update APN availability so that APN can be enabled.
- notifyOffApnsOfAvailability(Phone.REASON_DATA_ATTACHED);
+ notifyOffApnsOfAvailability();
}
if (mAutoAttachOnCreationConfig) {
mAutoAttachOnCreation.set(true);
@@ -1340,7 +1340,7 @@
// Assume data is connected on the simulator
// FIXME this can be improved
apnContext.setState(DctConstants.State.CONNECTED);
- mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
log("trySetupData: X We're on the simulator; assuming connected retValue=true");
return true;
@@ -1367,7 +1367,7 @@
buildWaitingApns(apnContext.getApnType(), radioTech);
if (waitingApns.isEmpty()) {
notifyNoData(DataFailCause.MISSING_UNKNOWN_APN, apnContext);
- notifyOffApnsOfAvailability(apnContext.getReason());
+ notifyOffApnsOfAvailability();
String str = "trySetupData: X No APN found retValue=false";
if (DBG) log(str);
apnContext.requestLog(str);
@@ -1382,16 +1382,16 @@
}
boolean retValue = setupData(apnContext, radioTech);
- notifyOffApnsOfAvailability(apnContext.getReason());
+ notifyOffApnsOfAvailability();
if (DBG) log("trySetupData: X retValue=" + retValue);
return retValue;
} else {
if (!apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DEFAULT)
&& apnContext.isConnectable()) {
- mPhone.notifyDataConnectionFailed(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnectionFailed(apnContext.getApnType());
}
- notifyOffApnsOfAvailability(apnContext.getReason());
+ notifyOffApnsOfAvailability();
StringBuilder str = new StringBuilder();
@@ -1418,12 +1418,11 @@
}
// Disabled apn's still need avail/unavail notifications - send them out
- private void notifyOffApnsOfAvailability(String reason) {
+ private void notifyOffApnsOfAvailability() {
for (ApnContext apnContext : mApnContexts.values()) {
if (!mAttached.get() || !apnContext.isReady()) {
- if (VDBG) log("notifyOffApnOfAvailability type:" + apnContext.getApnType());
- mPhone.notifyDataConnection(reason != null ? reason : apnContext.getReason(),
- apnContext.getApnType(),
+ if (DBG) log("notifyOffApnOfAvailability type:" + apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType(),
PhoneConstants.DataState.DISCONNECTED);
} else {
if (VDBG) {
@@ -1600,15 +1599,14 @@
// Should not be happen, but reset the state in case.
apnContext.setState(DctConstants.State.IDLE);
apnContext.requestLog("cleanUpConnectionInternal: connected, bug no dc");
- mPhone.notifyDataConnection(apnContext.getReason(),
- apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
}
}
} else {
// force clean up the data connection.
if (dataConnection != null) dataConnection.reset();
apnContext.setState(DctConstants.State.IDLE);
- mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
apnContext.setDataConnection(null);
}
@@ -1854,7 +1852,7 @@
apnContext.setDataConnection(dataConnection);
apnContext.setApnSetting(apnSetting);
apnContext.setState(DctConstants.State.CONNECTING);
- mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
Message msg = obtainMessage();
msg.what = DctConstants.EVENT_DATA_SETUP_COMPLETE;
@@ -2084,7 +2082,7 @@
if (DBG) log( "notifyNoData: type=" + apnContext.getApnType());
if (isPermanentFailure(lastFailCauseCode)
&& (!apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DEFAULT))) {
- mPhone.notifyDataConnectionFailed(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnectionFailed(apnContext.getApnType());
}
}
@@ -2102,7 +2100,7 @@
setInitialAttachApn();
if (mPhone.mCi.getRadioState() == TelephonyManager.RADIO_POWER_ON) {
if (DBG) log("onRecordsLoadedOrSubIdChanged: notifying data availability");
- notifyOffApnsOfAvailability(Phone.REASON_SIM_LOADED);
+ notifyOffApnsOfAvailability();
}
setupDataOnConnectableApns(Phone.REASON_SIM_LOADED);
}
@@ -2451,10 +2449,10 @@
// If the user did not enable data roaming, now when we transit from roaming to
// non-roaming, we should try to reestablish the data connection.
- notifyOffApnsOfAvailability(Phone.REASON_ROAMING_OFF);
+ notifyOffApnsOfAvailability();
setupDataOnConnectableApns(Phone.REASON_ROAMING_OFF);
} else {
- notifyDataConnection(Phone.REASON_ROAMING_OFF);
+ notifyDataConnection();
}
}
@@ -2485,14 +2483,14 @@
if (DBG) log("onDataRoamingOnOrSettingsChanged: setup data on roaming");
setupDataOnConnectableApns(Phone.REASON_ROAMING_ON);
- notifyDataConnection(Phone.REASON_ROAMING_ON);
+ notifyDataConnection();
} else {
// If the user does not turn on data roaming, when we transit from non-roaming to
// roaming, we need to tear down the data connection otherwise the user might be
// charged for data roaming usage.
if (DBG) log("onDataRoamingOnOrSettingsChanged: Tear down data connection on roaming.");
cleanUpAllConnectionsInternal(true, Phone.REASON_ROAMING_ON);
- notifyOffApnsOfAvailability(Phone.REASON_ROAMING_ON);
+ notifyOffApnsOfAvailability();
}
}
@@ -2518,14 +2516,14 @@
// Assume data is connected on the simulator
// FIXME this can be improved
// setState(DctConstants.State.CONNECTED);
- notifyDataConnection(null);
+ notifyDataConnection();
log("onRadioAvailable: We're on the simulator; assuming data is connected");
}
IccRecords r = mIccRecords.get();
if (r != null && r.getRecordsLoaded()) {
- notifyOffApnsOfAvailability(null);
+ notifyOffApnsOfAvailability();
}
if (getOverallState() != DctConstants.State.IDLE) {
@@ -2550,7 +2548,7 @@
if (DBG) log("onRadioOffOrNotAvailable: is off and clean up all connections");
cleanUpAllConnectionsInternal(false, Phone.REASON_RADIO_TURNED_OFF);
}
- notifyOffApnsOfAvailability(null);
+ notifyOffApnsOfAvailability();
}
private void completeConnection(ApnContext apnContext) {
@@ -2580,7 +2578,7 @@
mProvisioningSpinner));
}
- mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
startNetStatPoll();
startDataStallAlarm(DATA_STALL_NOT_SUSPECTED);
}
@@ -2745,9 +2743,8 @@
cause, cid, mTelephonyManager.getNetworkType());
}
ApnSetting apn = apnContext.getApnSetting();
- mPhone.notifyPreciseDataConnectionFailed(apnContext.getReason(),
- apnContext.getApnType(), apn != null ? apn.getApnName()
- : "unknown", cause + "");
+ mPhone.notifyPreciseDataConnectionFailed(apnContext.getApnType(),
+ apn != null ? apn.getApnName() : "unknown", cause + "");
// Compose broadcast intent send to the specific carrier signaling receivers
Intent intent = new Intent(TelephonyIntents
@@ -2826,7 +2823,7 @@
// If we are not going to retry any APN, set this APN context to failed state.
// This would be the final state of a data connection.
apnContext.setState(DctConstants.State.FAILED);
- mPhone.notifyDataConnection(Phone.REASON_APN_FAILED, apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
apnContext.setDataConnection(null);
log("onDataSetupCompleteError: Stop retrying APNs.");
}
@@ -2854,7 +2851,7 @@
if(DBG) log("onDisconnectDone: EVENT_DISCONNECT_DONE apnContext=" + apnContext);
apnContext.setState(DctConstants.State.IDLE);
- mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
// if all data connection are gone, check whether Airplane mode request was
// pending.
@@ -2930,7 +2927,7 @@
if (DBG) log("onVoiceCallStarted stop polling");
stopNetStatPoll();
stopDataStallAlarm();
- notifyDataConnection(Phone.REASON_VOICE_CALL_STARTED);
+ notifyDataConnection();
}
}
@@ -2941,7 +2938,7 @@
if (!mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) {
startNetStatPoll();
startDataStallAlarm(DATA_STALL_NOT_SUSPECTED);
- notifyDataConnection(Phone.REASON_VOICE_CALL_ENDED);
+ notifyDataConnection();
} else {
// clean slate after call end.
resetPollStats();
@@ -2951,15 +2948,6 @@
setupDataOnConnectableApns(Phone.REASON_VOICE_CALL_ENDED);
}
- private void onCleanUpConnection(boolean tearDown, int apnType, String reason) {
- if (DBG) log("onCleanUpConnection");
- ApnContext apnContext = mApnContextsByType.get(apnType);
- if (apnContext != null) {
- apnContext.setReason(reason);
- cleanUpConnectionInternal(tearDown, apnContext);
- }
- }
-
private boolean isConnected() {
for (ApnContext apnContext : mApnContexts.values()) {
if (apnContext.getState() == DctConstants.State.CONNECTED) {
@@ -2982,16 +2970,14 @@
return true;
}
- private void notifyDataConnection(String reason) {
- if (DBG) log("notifyDataConnection: reason=" + reason);
+ private void notifyDataConnection() {
for (ApnContext apnContext : mApnContexts.values()) {
if (mAttached.get() && apnContext.isReady()) {
if (DBG) log("notifyDataConnection: type:" + apnContext.getApnType());
- mPhone.notifyDataConnection(reason != null ? reason : apnContext.getReason(),
- apnContext.getApnType());
+ mPhone.notifyDataConnection(apnContext.getApnType());
}
}
- notifyOffApnsOfAvailability(reason);
+ notifyOffApnsOfAvailability();
}
private void setDataProfilesAsNeeded() {
diff --git a/tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java b/tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java
index 1785c8f..2758d7c 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java
@@ -168,21 +168,15 @@
@Test @SmallTest
public void testNotifyDataConnectionFailed() throws Exception {
- mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "BUSY", "APN_0");
- verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(0, "BUSY", "APN_0");
+ mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "APN_0");
+ verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(0, "APN_0");
- mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "LOCAL", "APN_0");
- verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(0, "LOCAL",
- "APN_0");
-
- mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "LOCAL", "APN_1");
- verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(0, "LOCAL",
- "APN_1");
+ mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "APN_1");
+ verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(0, "APN_1");
doReturn(1).when(mPhone).getSubId();
- mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "LOCAL", "APN_1");
- verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(1, "LOCAL",
- "APN_1");
+ mDefaultPhoneNotifierUT.notifyDataConnectionFailed(mPhone, "APN_1");
+ verify(mTelephonyRegisteryMock).notifyDataConnectionFailedForSubscriber(1, "APN_1");
}
@Test @SmallTest
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
index cd2dceb..3a567e8 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
@@ -29,10 +29,10 @@
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -81,7 +81,6 @@
import com.android.internal.R;
import com.android.internal.telephony.DctConstants;
import com.android.internal.telephony.ISub;
-import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyTest;
import com.android.server.pm.PackageManagerService;
@@ -537,7 +536,7 @@
}
private void verifyDataConnected(final String apnSetting) {
- verify(mPhone, times(1)).notifyDataConnection(eq(Phone.REASON_CONNECTED),
+ verify(mPhone, atLeastOnce()).notifyDataConnection(
eq(PhoneConstants.APN_TYPE_DEFAULT));
verify(mAlarmManager, times(1)).set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(),
@@ -584,31 +583,10 @@
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
waitForMs(200);
- ArgumentCaptor<String> apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_SIM_LOADED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
logd("Sending EVENT_DATA_CONNECTION_ATTACHED");
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_CONNECTION_ATTACHED, null));
waitForMs(200);
- apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_DATA_ATTACHED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
- apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_DATA_ENABLED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
logd("Sending EVENT_ENABLE_NEW_APN");
// APN id 0 is APN_TYPE_DEFAULT
mDct.setEnabled(ApnSetting.TYPE_DEFAULT, true);
@@ -634,8 +612,6 @@
@Test
@MediumTest
public void testDataRetry() throws Exception {
-
- //mDct.setUserDataEnabled(true);
AsyncResult ar = new AsyncResult(null,
new Pair<>(true, DataEnabledSettings.REASON_USER_DATA_ENABLED), null);
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_ENABLED_CHANGED, ar));
@@ -656,37 +632,15 @@
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
waitForMs(200);
- ArgumentCaptor<String> apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_SIM_LOADED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
logd("Sending EVENT_DATA_CONNECTION_ATTACHED");
mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_CONNECTION_ATTACHED, null));
waitForMs(200);
- apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_DATA_ATTACHED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
- apnTypeArgumentCaptor = ArgumentCaptor.forClass(String.class);
- verify(mPhone, times(sNetworkAttributes.length)).notifyDataConnection(
- eq(Phone.REASON_DATA_ENABLED), apnTypeArgumentCaptor.capture(),
- eq(PhoneConstants.DataState.DISCONNECTED));
-
- assertEquals(sApnTypes, apnTypeArgumentCaptor.getAllValues());
-
logd("Sending EVENT_ENABLE_NEW_APN");
// APN id 0 is APN_TYPE_DEFAULT
mDct.setEnabled(ApnSetting.TYPE_DEFAULT, true);
waitForMs(200);
-
dataConnectionReasons = new DataConnectionReasons();
allowed = isDataAllowed(dataConnectionReasons);
assertTrue(dataConnectionReasons.toString(), allowed);
@@ -700,10 +654,6 @@
any(Message.class));
verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);
- // Make sure we never notify connected because the data call setup is supposed to fail.
- verify(mPhone, never()).notifyDataConnection(eq(Phone.REASON_CONNECTED),
- eq(PhoneConstants.APN_TYPE_DEFAULT));
-
// Verify the retry manger schedule another data call setup.
verify(mAlarmManager, times(1)).setExact(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP),
anyLong(), any(PendingIntent.class));
diff --git a/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java b/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
index 7b26e49..1c636d5 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
@@ -306,26 +306,26 @@
@Override
public void notifyDataConnection(int state, boolean isDataConnectivityPossible,
- String reason, String apn, String apnType, LinkProperties linkProperties,
+ String apn, String apnType, LinkProperties linkProperties,
NetworkCapabilities networkCapabilities, int networkType, boolean roaming) {
throw new RuntimeException("Not implemented");
}
@Override
public void notifyDataConnectionForSubscriber(int subId, int state,
- boolean isDataConnectivityPossible, String reason, String apn, String apnType,
+ boolean isDataConnectivityPossible, String apn, String apnType,
LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
int networkType, boolean roaming) {
throw new RuntimeException("Not implemented");
}
@Override
- public void notifyDataConnectionFailed(String reason, String apnType) {
+ public void notifyDataConnectionFailed(String apnType) {
throw new RuntimeException("Not implemented");
}
@Override
- public void notifyDataConnectionFailedForSubscriber(int subId, String reason, String apnType) {
+ public void notifyDataConnectionFailedForSubscriber(int subId, String apnType) {
throw new RuntimeException("Not implemented");
}
@@ -377,7 +377,7 @@
}
@Override
- public void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn,
+ public void notifyPreciseDataConnectionFailed(String apnType, String apn,
String failCause) {
throw new RuntimeException("Not implemented");
}
