commit 666e43c090301c24c36e645fdb935b9f8deb8eb0
author Evan Charlton <evanc@google.com> Mon Jul 21 01:08:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 18 22:16:50 2014 +0000
tree 93a9d49300225d914668de26edabd1c1b703a3ea
parent 5ad698f06592baf77a439007e0f084df85916a54
parent 0d5710d9bfdb36d5d0a7be4eaf3f39ae3fb30bc5

Merge "Rename setDestroy() to destroy()" into lmp-dev

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

diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index 699090f..efc9676 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -278,7 +278,7 @@
             getPhone().unregisterForPreciseCallStateChanged(mHandler);
         }
         mOriginalConnection = null;
-        setDestroyed();
+        destroy();
     }
 
     private static void log(String msg) {

src/com/android/services/telephony/ConferenceConnection.java

diff --git a/src/com/android/services/telephony/ConferenceConnection.java b/src/com/android/services/telephony/ConferenceConnection.java
index dbcdbfe..1afc8e0 100644
--- a/src/com/android/services/telephony/ConferenceConnection.java
+++ b/src/com/android/services/telephony/ConferenceConnection.java
@@ -31,7 +31,7 @@
     protected void onChildrenChanged(List<Connection> children) {
         if (children.isEmpty()) {
             setDisconnected(DisconnectCause.LOCAL, "conference call disconnected.");
-            setDestroyed();
+            destroy();
         }
     }
 

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 5176b27..13f0b0c 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -18,14 +18,10 @@
 
 import android.net.Uri;
 import android.os.AsyncResult;
-import android.content.ComponentName;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.telecomm.CallAudioState;
 import android.telecomm.CallCapabilities;
-import android.telecomm.ConnectionService;
-import android.telecomm.StatusHints;
 import android.telephony.DisconnectCause;
 
 import com.android.internal.telephony.Call;
@@ -35,8 +31,6 @@
 import com.android.phone.R;
 
 import android.telecomm.Connection;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
 
 import java.util.List;
 import java.util.Objects;
@@ -446,7 +440,7 @@
             getPhone().unregisterForRingbackTone(mHandler);
         }
         mOriginalConnection = null;
-        setDestroyed();
+        destroy();
     }
 
     /**