commit b75573f94f1693739f84c313090a151d97d028ae
author Nancy Chen <nancychen@google.com> Tue Sep 09 18:00:41 2014 -0700
committer Nancy Chen <nancychen@google.com> Thu Sep 11 12:58:39 2014 -0700
tree 8d6a978c8fcfc0626f08c218250defee0b96f264
parent eeff153f4cbeea5d4d1ce27c2f9ca2ea0ca482c8

Update TelecommManager per API requirements. (3/3)

+ Add constants GATEWAY_PROVIDER_PACKAGE and GATEWAY_ORIGINAL_ADDRESS
- Remove those corresponding constants from private packages
+ Modify clearAccounts() so it no longer takes an argument.

Bug: 17329632
Change-Id: Ia5241a9161bef5479fcc2d6665eeb105b8397022

sip/src/com/android/services/telephony/sip/SipConnectionService.java

diff --git a/sip/src/com/android/services/telephony/sip/SipConnectionService.java b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
index 16efc4d..e10d94d 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnectionService.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
@@ -68,7 +68,8 @@
         if (VERBOSE) log("onCreateOutgoingConnection, request: " + request);
 
         Bundle extras = request.getExtras();
-        if (extras != null && extras.getString(SipUtil.GATEWAY_PROVIDER_PACKAGE) != null) {
+        if (extras != null &&
+                extras.getString(TelecommManager.GATEWAY_PROVIDER_PACKAGE) != null) {
             return Connection.createFailedConnection(
                     DisconnectCause.CALL_BARRED, "Cannot make a SIP call with a gateway number.");
         }

sip/src/com/android/services/telephony/sip/SipUtil.java

diff --git a/sip/src/com/android/services/telephony/sip/SipUtil.java b/sip/src/com/android/services/telephony/sip/SipUtil.java
index 340ebda..c16714d 100644
--- a/sip/src/com/android/services/telephony/sip/SipUtil.java
+++ b/sip/src/com/android/services/telephony/sip/SipUtil.java
@@ -39,8 +39,6 @@
             "com.android.services.telephony.sip.incoming_call_intent";
     static final String EXTRA_PHONE_ACCOUNT =
             "com.android.services.telephony.sip.phone_account";
-    static final String GATEWAY_PROVIDER_PACKAGE =
-            "com.android.phone.extra.GATEWAY_PROVIDER_PACKAGE";
 
     private SipUtil() {
     }