commit a36cb1ebb5f151aa934c69d4d5de1143c6218107
author Hung-ying Tyan <tyanh@google.com> Mon Aug 09 20:00:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 09 20:00:05 2010 -0700
tree 57a14cac5412cc4ae24e99836d9bf51e37d5ceef
parent f21d4ed7b897d9a3decfec1c5b5179f202132b15
parent 8b8b4536314d1354c244af2c9e665c4db4e27522

am 8b8b4536: am 8fb2e6e4: PhoneFactory: add makeSipPhone()

Merge commit '8b8b4536314d1354c244af2c9e665c4db4e27522'

* commit '8b8b4536314d1354c244af2c9e665c4db4e27522':
  PhoneFactory: add makeSipPhone()

telephony/java/com/android/internal/telephony/PhoneFactory.java

diff --git a/telephony/java/com/android/internal/telephony/PhoneFactory.java b/telephony/java/com/android/internal/telephony/PhoneFactory.java
index 803b736..2e391cb 100644
--- a/telephony/java/com/android/internal/telephony/PhoneFactory.java
+++ b/telephony/java/com/android/internal/telephony/PhoneFactory.java
@@ -24,6 +24,8 @@
 
 import com.android.internal.telephony.cdma.CDMAPhone;
 import com.android.internal.telephony.gsm.GSMPhone;
+import com.android.internal.telephony.sip.SipPhone;
+import com.android.internal.telephony.sip.SipPhoneFactory;
 
 /**
  * {@hide}
@@ -175,4 +177,13 @@
             return phone;
         }
     }
+
+    /**
+     * Makes a {@link SipPhone} object.
+     * @param sipUri the local SIP URI the phone runs on
+     * @return the {@code SipPhone} object or null if the SIP URI is not valid
+     */
+    public static SipPhone makeSipPhone(String sipUri) {
+        return SipPhoneFactory.makePhone(sipUri, sContext, sPhoneNotifier);
+    }
 }

telephony/java/com/android/internal/telephony/sip/SipPhoneFactory.java

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhoneFactory.java b/telephony/java/com/android/internal/telephony/sip/SipPhoneFactory.java
index c9e9762..a1bdd2f 100644
--- a/telephony/java/com/android/internal/telephony/sip/SipPhoneFactory.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhoneFactory.java
@@ -16,7 +16,6 @@
 
 package com.android.internal.telephony.sip;
 
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneNotifier;
 
 import android.content.Context;
@@ -26,42 +25,25 @@
 import java.text.ParseException;
 
 /**
- * @hide
+ * {@hide}
  */
 public class SipPhoneFactory {
-    private static PhoneNotifier sPhoneNotifier = makeDefaultPhoneNotifier();
-    private static Context sContext;
-
-    public static void makeDefaultPhones(Context context) {
-        makeDefaultPhone(context);
-    }
-
-    public static void makeDefaultPhone(Context context) {
-        sContext = context;
-        SipPhoneProxy.getInstance().setPhone(
-                makePhone("sip:anonymous@localhost"));
-    }
-
-    public static Phone getDefaultPhone() {
-       return SipPhoneProxy.getInstance();
-    }
-
-    public static SipPhone makePhone(String sipProfileUri) {
+    /**
+     * Makes a {@link SipPhone} object.
+     * @param sipUri the local SIP URI the phone runs on
+     * @param context {@code Context} needed to create a Phone object
+     * @param phoneNotifier {@code PhoneNotifier} needed to create a Phone
+     *      object
+     * @return the {@code SipPhone} object or null if the SIP URI is not valid
+     */
+    public static SipPhone makePhone(String sipUri, Context context,
+            PhoneNotifier phoneNotifier) {
         try {
-            SipProfile profile = new SipProfile.Builder(sipProfileUri).build();
-            return new SipPhone(sContext, sPhoneNotifier, profile);
+            SipProfile profile = new SipProfile.Builder(sipUri).build();
+            return new SipPhone(context, phoneNotifier, profile);
         } catch (ParseException e) {
-            Log.v("SipPhoneProxy", "setPhone", e);
+            Log.w("SipPhoneProxy", "setPhone", e);
             return null;
         }
     }
-
-    private static PhoneNotifier makeDefaultPhoneNotifier() {
-        try {
-            return new com.android.internal.telephony.SipPhoneNotifier();
-        } catch (Error e) {
-            Log.e("SipPhoneProxy", "makeDefaultPhoneNotifier", e);
-            throw e;
-        }
-    }
 }