diff options
author | Sailesh Nepal <sail@google.com> | 2016-02-22 20:35:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-22 20:35:09 +0000 |
commit | fd70e58784fe49e321cd3a5e759da984667f5277 (patch) | |
tree | a766ce4ac2e3ec43b004071bf11f98b2aefab600 /InCallUI/src/com/android/incallui/InCallActivity.java | |
parent | 639ed3451d911c9a282d1351b87595f3e1d8aaa4 (diff) | |
parent | 6a4e9d87031f1f803ce9b64844f71c73e9502a7e (diff) |
Merge "Remove Lollipop support for InCallUI" into nyc-dev
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 73155a460..dec1323b2 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -58,7 +58,6 @@ import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.Selec import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; import com.android.incallui.Call.State; -import com.android.incallui.compat.telecom.DetailsCompat; import com.android.incallui.util.AccessibilityUtil; import com.android.phone.common.animation.AnimUtils; import com.android.phone.common.animation.AnimationListenerAdapter; @@ -573,7 +572,7 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD Bundle extras = null; if (call != null) { - extras = DetailsCompat.getIntentExtras(call.getTelecomCall().getDetails()); + extras = call.getTelecomCall().getDetails().getIntentExtras(); } if (extras == null) { // Initialize the extras bundle to avoid NPE @@ -610,8 +609,8 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD Call pendingAccountSelectionCall = CallList.getInstance().getWaitingForAccountCall(); if (pendingAccountSelectionCall != null) { showCallCardFragment(false); - Bundle extras = DetailsCompat.getIntentExtras(pendingAccountSelectionCall - .getTelecomCall().getDetails()); + Bundle extras = + pendingAccountSelectionCall.getTelecomCall().getDetails().getIntentExtras(); final List<PhoneAccountHandle> phoneAccountHandles; if (extras != null) { |