diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-08-05 22:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 22:13:07 +0000 |
| commit | f0affc6d46849e844bec9ddc755ffae0042e443f (patch) | |
| tree | 8ce9659e869ad2aaaf28d39fb37f67d766ed5ea3 /api | |
| parent | 2c1a22d91607e18c7618e79ab026d3c5c4ce8949 (diff) | |
| parent | 5346396ba2077a8bd03da1adde46db6b39669ac9 (diff) | |
| download | frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.zip frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.tar.gz frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.tar.bz2 | |
Merge "Correctly hide setConnectionService" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index e16294e..05e494b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30091,7 +30091,6 @@ package android.telecom { method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>); method public final void setConnectionCapabilities(int); - method public final void setConnectionService(android.telecom.ConnectionService); method public final void setDialing(); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setExtras(android.os.Bundle); diff --git a/api/system-current.txt b/api/system-current.txt index a784378..d9702ac 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32276,7 +32276,6 @@ package android.telecom { method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>); method public final void setConnectionCapabilities(int); - method public final void setConnectionService(android.telecom.ConnectionService); method public final void setDialing(); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setExtras(android.os.Bundle); |