From 36a713431ceda2e5462c5dc5d1300f32acf9e63a Mon Sep 17 00:00:00 2001 From: Evan Charlton Date: Sat, 19 Jul 2014 16:31:02 -0700 Subject: [PATCH] Rename setDestroy() to destroy() Change-Id: I6bb46e679f55547b902d5850ab450e5d3818fa63 --- api/current.txt | 2 +- telecomm/java/android/telecomm/Connection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index bd74f4d0387ec..f53f3cd619476 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28435,6 +28435,7 @@ package android.telecomm { public abstract class Connection { ctor protected Connection(); + method public final void destroy(); method public final boolean getAudioModeIsVoip(); method public final android.telecomm.CallAudioState getCallAudioState(); method public final int getCallCapabilities(); @@ -28470,7 +28471,6 @@ package android.telecomm { method public final void setCallCapabilities(int); method public final void setCallVideoProvider(android.telecomm.CallVideoProvider); method public final void setCallerDisplayName(java.lang.String, int); - method public final void setDestroyed(); method public final void setDialing(); method public final void setDisconnected(int, java.lang.String); method public final void setHandle(android.net.Uri, int); diff --git a/telecomm/java/android/telecomm/Connection.java b/telecomm/java/android/telecomm/Connection.java index d4af50c3d490d..5c8c4a36aede7 100644 --- a/telecomm/java/android/telecomm/Connection.java +++ b/telecomm/java/android/telecomm/Connection.java @@ -419,7 +419,7 @@ public abstract class Connection { /** * TODO(santoscordon): Needs documentation. */ - public final void setDestroyed() { + public final void destroy() { // It is possible that onDestroy() will trigger the listener to remove itself which will // result in a concurrent modification exception. To counteract this we make a copy of the // listeners and iterate on that.