Minimal set of changes needed to run with the modified frameworks/base.
Wink Saville [Fri, 22 May 2009 17:08:20 +0000 (10:08 -0700)]
Another set of changes will be coming next week to complete this
merge.

src/com/android/phone/CallNotifier.java
src/com/android/phone/EmergencyCallbackMode.java
src/com/android/phone/PhoneApp.java
src/com/android/phone/PhoneInterfaceManager.java

index 9def49d..f875f25 100644 (file)
@@ -101,7 +101,7 @@ public class CallNotifier extends Handler
         mPhone.registerForDisconnect(this, PHONE_DISCONNECT, null);
         mPhone.registerForUnknownConnection(this, PHONE_UNKNOWN_CONNECTION_APPEARED, null);
         mPhone.registerForIncomingRing(this, PHONE_INCOMING_RING, null);
-        mPhone.registerForCdmaCallWaiting(this,PHONE_CDMA_CALL_WAITING, null);
+        mPhone.registerForCallWaiting(this,PHONE_CDMA_CALL_WAITING, null);
         mRinger = ringer;
         mBluetoothHandsfree = btMgr;
 
index 7c134b6..5bbc51b 100644 (file)
@@ -81,8 +81,10 @@ public class EmergencyCallbackMode extends Activity {
     {
         public void onClick(View v) {
             // Send ECBM exit
-            mPhone.exitEmergencyCallbackMode(Message.obtain(mExitEmergencyCallbackMode,
-                    EVENT_EXIT_ECBM));
+
+            // TODO(Moto): There is a change, no parameter looks like an intent is sent?
+            //mPhone.exitEmergencyCallbackMode(Message.obtain(mExitEmergencyCallbackMode,
+            //        EVENT_EXIT_ECBM));
         }
     };
 
index 5b43012..ef3c7de 100644 (file)
@@ -371,7 +371,7 @@ public class PhoneApp extends Application {
             intentFilter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
-            intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_ENTERED);
+            intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
             registerReceiver(mReceiver, intentFilter);
 
             // Use a separate receiver for ACTION_MEDIA_BUTTON broadcasts,
@@ -420,7 +420,8 @@ public class PhoneApp extends Application {
         mShouldRestoreMuteOnInCallResume = false;
 
         //Register for Cdma Information Records
-        phone.registerCdmaInformationRecord(mHandler, EVENT_UNSOL_CDMA_INFO_RECORD, null);
+// TODO(Moto): Merge
+//        phone.registerCdmaInformationRecord(mHandler, EVENT_UNSOL_CDMA_INFO_RECORD, null);
    }
 
     /**
@@ -1101,7 +1102,7 @@ public class PhoneApp extends Application {
                 initForNewRadioTechnology();
             } else if (action.equals(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED)) {
                 handleServiceStateChanged(intent);
-            } else if (action.equals(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_ENTERED)) {
+            } else if (action.equals(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED)) {
                 Log.d(LOG_TAG, "Emergency Callback Mode arrived in PhoneApp.");
                 // Send Intend to start ECBM application
                 Intent EcbmAlarm = new Intent(Intent.ACTION_MAIN, null);
index bc1ed43..176afcb 100644 (file)
@@ -647,5 +647,13 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
     public String getCdmaEriText() {
         return mPhone.getCdmaEriText();
     }
+    
+    /**
+     * Returns the unread count of voicemails
+     */
+   public int getCountVoiceMessages() {
+       // TODO(Moto): implement
+       return 0;
+   }
 
 }