diff options
author | Evan Charlton <evanc@google.com> | 2014-05-14 19:49:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-14 19:49:38 +0000 |
commit | 6deb1a432f6117447e30d21fd5278b4b9074d9ce (patch) | |
tree | 640065fb05619e3583b0398abc4f2ab18472aca5 /InCallUI | |
parent | c641d6ada5bb6d29e5063c97d8395292cd63b187 (diff) | |
parent | d3282ec0e046daf7ea162465d287026289bbeb72 (diff) |
am c7f8ba27: Remove setInCallServiceAdapter usage
* commit 'c7f8ba27e0fa19f748bef2060f5473bd07d068bf':
Remove setInCallServiceAdapter usage
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallServiceImpl.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java index 8bd7e816b..68b3c2c21 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -21,6 +21,7 @@ import android.telecomm.CallCapabilities; import android.telecomm.CallInfo; import android.telecomm.GatewayInfo; import android.telecomm.InCallAdapter; +import android.telecomm.InCallService; import android.telephony.DisconnectCause; import com.google.common.collect.ImmutableList; @@ -31,7 +32,7 @@ import com.google.common.collect.ImmutableList; * dialing (outgoing), and active calls. When the last call is disconnected, Telecomm will unbind to * the service triggering InCallActivity (via CallList) to finish soon after. */ -public class InCallServiceImpl extends android.telecomm.InCallService { +public class InCallServiceImpl extends InCallService { private static final ImmutableList<String> EMPTY_RESPONSE_TEXTS = ImmutableList.of(); @@ -47,6 +48,7 @@ public class InCallServiceImpl extends android.telecomm.InCallService { @Override public void onDestroy() { Log.v(this, "onDestroy"); // Tear down the InCall system + TelecommAdapter.getInstance().setAdapter(null); CallList.getInstance().clearOnDisconnect(); InCallPresenter.getInstance().tearDown(); } @@ -55,8 +57,8 @@ public class InCallServiceImpl extends android.telecomm.InCallService { * TODO(santoscordon): Rename this to setTelecommAdapter. * {@inheritDoc} */ - @Override protected void setInCallAdapter(InCallAdapter inCallAdapter) { - Log.v(this, "setInCallAdapter"); + @Override protected void onAdapterAttached(InCallAdapter inCallAdapter) { + Log.v(this, "onAdapterAttached"); TelecommAdapter.getInstance().setAdapter(inCallAdapter); } |