commit 788959e2d798da2d8a34cf89779421966d200f3d
author Sailesh Nepal <sail@google.com> Tue Jul 08 23:36:40 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Jul 09 09:58:35 2014 -0700
tree fb368613d5220be01b1ae0663e3c01596acb3045
parent 9d67f24b3101e21894610c8e4b74a71ecd018898

SIP Part 1, move sip code

This CL moves the SIP code to
sip/src/com/android/services/telephony/sip

Moving the SIP code helps with a couple of things:
  - remove legacy dependency on old telephony code
    (PhoneUtils, etc...)
  - separate SIP from the PSTN connection code which
    is very different from SIP code
  - get the code ready for a future move out of
    Telephony all together

Bug: 14999064
Change-Id: Id32de6517d31be4aa177b2764d5bac1e1f9851c2

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 83f9f20..4279616 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -466,32 +466,38 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="SipBroadcastReceiver">
+        <service android:singleUser="true"
+                 android:name="com.android.services.telephony.sip.SipConnectionService"
+                 android:label="@string/sip_connection_service_label">
+            <intent-filter>
+                <action android:name="android.telecomm.ConnectionService" />
+            </intent-filter>
+        </service>
+        <receiver android:name="com.android.services.telephony.sip.SipBroadcastReceiver">
             <intent-filter>
                 <action android:name="com.android.phone.SIP_INCOMING_CALL" />
-                <action android:name="com.android.phone.SIP_ADD_PHONE" />
-                <action android:name="com.android.phone.SIP_REMOVE_PHONE" />
                 <action android:name="android.net.sip.SIP_SERVICE_UP" />
             </intent-filter>
         </receiver>
 
         <activity android:label="Sip Settings"
-                  android:name=".sip.SipSettings"
+                  android:name="com.android.services.telephony.sip.SipSettings"
                   android:theme="@style/SettingsLight"
                   android:launchMode="singleTop"
                   android:configChanges="orientation|screenSize|keyboardHidden"
-                  android:uiOptions="splitActionBarWhenNarrow">
+                  android:uiOptions="splitActionBarWhenNarrow"
+                  android:parentActivityName="com.android.phone.CallFeaturesSetting" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.sip.NOTIFY" />
             </intent-filter>
         </activity>
-        <activity android:name=".sip.SipEditor"
+        <activity android:name="com.android.services.telephony.sip.SipEditor"
                 android:theme="@style/SettingsLight"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:uiOptions="splitActionBarWhenNarrow">
         </activity>
-        <activity android:name=".SipCallOptionHandler"
+        <activity android:name="com.android.services.telephony.SipCallOptionHandler"
                 android:theme="@style/SipCallOptionHandlerTheme"
                 android:screenOrientation="nosensor"
                 android:configChanges="orientation|screenSize|keyboardHidden"
@@ -558,14 +564,6 @@
                 <action android:name="android.telecomm.ConnectionService" />
             </intent-filter>
         </service>
-        <service
-                android:singleUser="true"
-                android:name="com.android.services.telephony.SipConnectionService"
-                android:label="@string/sip_connection_service_label">
-            <intent-filter>
-                <action android:name="android.telecomm.ConnectionService" />
-            </intent-filter>
-        </service>
         <provider
                 android:name="PhoneSearchIndexablesProvider"
                 android:authorities="com.android.phone"