diff options
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneCapabilities.java | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 51f193f..44fa157 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -911,6 +911,7 @@ public abstract class Connection { mConference = conference; if (mConnectionService != null && mConnectionService.containsConference(conference)) { fireConferenceChanged(); + onConferenceChanged(); } return true; } @@ -1009,6 +1010,11 @@ public abstract class Connection { */ public void onPostDialContinue(boolean proceed) {} + /** + * Notifies this Connection that the conference which is set on it has changed. + */ + public void onConferenceChanged() {} + static String toLogSafePhoneNumber(String number) { // For unknown number, log empty string. if (number == null) { diff --git a/telecomm/java/android/telecom/PhoneCapabilities.java b/telecomm/java/android/telecom/PhoneCapabilities.java index c7d9014..9c67503 100644 --- a/telecomm/java/android/telecom/PhoneCapabilities.java +++ b/telecomm/java/android/telecom/PhoneCapabilities.java @@ -103,6 +103,17 @@ public final class PhoneCapabilities { return (capabilities & capability) != 0; } + /** + * Removes the specified capability from the set of capabilities and returns the new set. + * @param capabilities The set of capabilities. + * @param capability The capability to remove from the set. + * @return The set of capabilities, with the capability removed. + * @hide + */ + public static int remove(int capabilities, int capability) { + return capabilities & ~capability; + } + public static String toString(int capabilities) { StringBuilder builder = new StringBuilder(); builder.append("[Capabilities:"); |