diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-05-28 23:06:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 23:06:20 +0000 |
| commit | d5f86b177e1ff2ae0ffd1383a41b71a70314188c (patch) | |
| tree | 51b1dde298696ca43c357ac4118e8b9168b4d489 /InCallUI | |
| parent | 6a477839a223d914f3cc5efe119a607db89aec85 (diff) | |
| parent | 9b4265b667ae6b1262ef124694344abc48bb9884 (diff) | |
Merge "Add extras to Connections/Calls. (3/3)" into mnc-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 4 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 4 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 819d7df20..ac9a46c07 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -385,6 +385,10 @@ public class Call { : getTelecommCall().getDetails().getCallerDisplayName(); } + public Bundle getIntentExtras() { + return mTelecommCall == null ? null : mTelecommCall.getDetails().getIntentExtras(); + } + public Bundle getExtras() { return mTelecommCall == null ? null : mTelecommCall.getDetails().getExtras(); } diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index d1bebe738..89e73439b 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -577,7 +577,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { Bundle extras = null; if (call != null) { - extras = call.getTelecommCall().getDetails().getExtras(); + extras = call.getTelecommCall().getDetails().getIntentExtras(); } if (extras == null) { // Initialize the extras bundle to avoid NPE @@ -613,7 +613,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { if (pendingAccountSelectionCall != null) { showCallCardFragment(false); Bundle extras = pendingAccountSelectionCall - .getTelecommCall().getDetails().getExtras(); + .getTelecommCall().getDetails().getIntentExtras(); final List<PhoneAccountHandle> phoneAccountHandles; if (extras != null) { diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 18b268654..47342956c 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -1127,7 +1127,7 @@ public class InCallPresenter implements CallList.Listener, */ public static boolean isCallWithNoValidAccounts(Call call) { if (call != null && !isEmergencyCall(call)) { - Bundle extras = call.getExtras(); + Bundle extras = call.getIntentExtras(); if (extras == null) { extras = EMPTY_EXTRAS; @@ -1161,7 +1161,7 @@ public class InCallPresenter implements CallList.Listener, private void setDisconnectCauseForMissingAccounts(Call call) { android.telecom.Call telecomCall = call.getTelecommCall(); - Bundle extras = telecomCall.getDetails().getExtras(); + Bundle extras = telecomCall.getDetails().getIntentExtras(); // Initialize the extras bundle to avoid NPE if (extras == null) { extras = new Bundle(); |