Remove PhoneType check while registering events.
Part of effort of PHONE_TYPE_CDMA cleanup.
While regitering phone events via CallManager, there is no need to
check PHONE_TYPE anymore since CallManager will do internal check
and register to the corresponding events in registerPhone().
PhoneApp should register to all phone events and let CallManager
determine which phone supports which kind of events.
Change-Id: I7e9df61b7df8fd1d0127d7fbe0bf305663e7a4dc
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index a3274e1..ce7109d 100755
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -834,10 +834,7 @@
mCM.registerForDisconnect(this, PHONE_DISCONNECT, null);
mCM.registerForUnknownConnection(this, PHONE_UNKNOWN_CONNECTION_APPEARED, null);
mCM.registerForIncomingRing(this, PHONE_INCOMING_RING, null);
-
- if (TelephonyCapabilities.supportsOtasp(mApplication.phone)) {
- mCM.registerForCdmaOtaStatusChange(this, EVENT_OTA_PROVISION_CHANGE, null);
- }
+ mCM.registerForCdmaOtaStatusChange(this, EVENT_OTA_PROVISION_CHANGE, null);
mCM.registerForCallWaiting(this, PHONE_CDMA_CALL_WAITING, null);
mCM.registerForDisplayInfo(this, PHONE_STATE_DISPLAYINFO, null);
mCM.registerForSignalInfo(this, PHONE_STATE_SIGNALINFO, null);
diff --git a/src/com/android/phone/InCallScreen.java b/src/com/android/phone/InCallScreen.java
index b26915b..e03914d 100755
--- a/src/com/android/phone/InCallScreen.java
+++ b/src/com/android/phone/InCallScreen.java
@@ -1049,28 +1049,17 @@
if (!mRegisteredForPhoneStates) {
mCM.registerForPreciseCallStateChanged(mHandler, PHONE_STATE_CHANGED, null);
mCM.registerForDisconnect(mHandler, PHONE_DISCONNECT, null);
- int phoneType = mPhone.getPhoneType();
- if (phoneType == Phone.PHONE_TYPE_GSM) {
- mCM.registerForMmiInitiate(mHandler, PhoneApp.MMI_INITIATE, null);
-
- // register for the MMI complete message. Upon completion,
- // PhoneUtils will bring up a system dialog instead of the
- // message display class in PhoneUtils.displayMMIComplete().
- // We'll listen for that message too, so that we can finish
- // the activity at the same time.
- mCM.registerForMmiComplete(mHandler, PhoneApp.MMI_COMPLETE, null);
- } else if (phoneType == Phone.PHONE_TYPE_CDMA) {
- if (DBG) log("Registering for Call Waiting.");
- mCM.registerForCallWaiting(mHandler, PHONE_CDMA_CALL_WAITING, null);
- } else {
- throw new IllegalStateException("Unexpected phone type: " + phoneType);
- }
-
- mPhone.setOnPostDialCharacter(mHandler, POST_ON_DIAL_CHARS, null);
+ mCM.registerForMmiInitiate(mHandler, PhoneApp.MMI_INITIATE, null);
+ // register for the MMI complete message. Upon completion,
+ // PhoneUtils will bring up a system dialog instead of the
+ // message display class in PhoneUtils.displayMMIComplete().
+ // We'll listen for that message too, so that we can finish
+ // the activity at the same time.
+ mCM.registerForMmiComplete(mHandler, PhoneApp.MMI_COMPLETE, null);
+ mCM.registerForCallWaiting(mHandler, PHONE_CDMA_CALL_WAITING, null);
+ mCM.registerForPostDialCharacter(mHandler, POST_ON_DIAL_CHARS, null);
mCM.registerForSuppServiceFailed(mHandler, SUPP_SERVICE_FAILED, null);
- if (phoneType == Phone.PHONE_TYPE_CDMA) {
- mCM.registerForCdmaOtaStatusChange(mHandler, EVENT_OTA_PROVISION_CHANGE, null);
- }
+ mCM.registerForCdmaOtaStatusChange(mHandler, EVENT_OTA_PROVISION_CHANGE, null);
mRegisteredForPhoneStates = true;
}
}
@@ -1079,9 +1068,10 @@
mCM.unregisterForPreciseCallStateChanged(mHandler);
mCM.unregisterForDisconnect(mHandler);
mCM.unregisterForMmiInitiate(mHandler);
+ mCM.unregisterForMmiComplete(mHandler);
mCM.unregisterForCallWaiting(mHandler);
mCM.unregisterForSuppServiceFailed(mHandler);
- mPhone.setOnPostDialCharacter(null, POST_ON_DIAL_CHARS, null);
+ mCM.unregisterForPostDialCharacter(mHandler);
mCM.unregisterForCdmaOtaStatusChange(mHandler);
mRegisteredForPhoneStates = false;
}
@@ -2051,7 +2041,7 @@
if (VDBG) log("handlePostOnDialChar: state = " +
state + ", ch = " + ch);
- int phoneType = mPhone.getPhoneType();
+ int phoneType = c.getCall().getPhone().getPhoneType();
switch (state) {
case STARTED:
if (phoneType == Phone.PHONE_TYPE_CDMA) {
diff --git a/src/com/android/phone/PhoneApp.java b/src/com/android/phone/PhoneApp.java
index 1f625fe..6a25bfe 100644
--- a/src/com/android/phone/PhoneApp.java
+++ b/src/com/android/phone/PhoneApp.java
@@ -467,9 +467,7 @@
}
// register for MMI/USSD
- if (phoneType == Phone.PHONE_TYPE_GSM) {
- phone.registerForMmiComplete(mHandler, MMI_COMPLETE, null);
- }
+ mCM.registerForMmiComplete(mHandler, MMI_COMPLETE, null);
// register connection tracking to PhoneUtils
PhoneUtils.initializeConnectionHandler(mCM);
