diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-15 12:57:42 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-15 14:04:19 -0700 |
| commit | 4cd92835be0a4ed2b32b398b0fa9d0d74dfb8b19 (patch) | |
| tree | 7d2cfe62cc7c14bee70a12c09e86db7355f8b054 /telecomm/java | |
| parent | ea76e49e6ff647aae633bfcab874b624e964473c (diff) | |
| download | frameworks_base-4cd92835be0a4ed2b32b398b0fa9d0d74dfb8b19.zip frameworks_base-4cd92835be0a4ed2b32b398b0fa9d0d74dfb8b19.tar.gz frameworks_base-4cd92835be0a4ed2b32b398b0fa9d0d74dfb8b19.tar.bz2 | |
Fixing build after merge from mirror-m-wireless-internal-release
There have been few breaking changes
1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out
Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
Diffstat (limited to 'telecomm/java')
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index a94c2f6..9eb2f5d 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -93,7 +93,6 @@ public class PhoneAccount implements Parcelable { * Flag indicating that this {@code PhoneAccount} is capable of placing video calls. * <p> * See {@link #getCapabilities} - * @hide */ @SystemApi public static final int CAPABILITY_VIDEO_CALLING = 0x8; diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index b40afbf..ab7864b 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -519,7 +519,6 @@ public class TelecomManager { * @see #EXTRA_PHONE_ACCOUNT_HANDLE * @return A list of {@code PhoneAccountHandle} objects. * - * @hide */ public List<PhoneAccountHandle> getCallCapablePhoneAccounts() { try { |