Redirect references to OTASP_ Constants to TelephonyManager
-Constants from ServiceStateTracker have moved to
TelephonyManager, so we are repointing these references. No
functional change.
Bug: 33414487
Change-Id: I8acb3577d8cdd13d6e897a9c2db910913c6dd705
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f59e97f..a5f9c07 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -80,6 +80,7 @@
import com.android.internal.telephony.MccTable;
import com.android.internal.telephony.OperatorInfo;
import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstantConversions;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.ProxyController;
@@ -1576,16 +1577,16 @@
public int getCallStateForSlot(int slotIndex) {
Phone phone = PhoneFactory.getPhone(slotIndex);
return phone == null ? TelephonyManager.CALL_STATE_IDLE :
- DefaultPhoneNotifier.convertCallState(phone.getState());
+ PhoneConstantConversions.convertCallState(phone.getState());
}
@Override
public int getDataState() {
Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
if (phone != null) {
- return DefaultPhoneNotifier.convertDataState(phone.getDataConnectionState());
+ return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
} else {
- return DefaultPhoneNotifier.convertDataState(PhoneConstants.DataState.DISCONNECTED);
+ return PhoneConstantConversions.convertDataState(PhoneConstants.DataState.DISCONNECTED);
}
}