Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Charlton
2014-07-21 01:08:20 +00:00
committed by Android (Google) Code Review
parent 40075c7cdd 36a713431c
commit 2c4b812a29
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28428,6 +28428,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();
@@ -28463,7 +28464,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);

2
telecomm/java/android/telecomm/Connection.java
View File

@@ -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.