diff options
author | Yorke Lee <yorkelee@google.com> | 2014-07-25 23:54:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 23:54:21 +0000 |
commit | 842408d96d56b06cbcbffda28d02e8fb8bae3407 (patch) | |
tree | 972b9386d1981705ab3f3b1ab2f8c118eed8182d /InCallUI | |
parent | 24974b7f578c2ac227503089236cce84d41db042 (diff) | |
parent | 6f8b826d05aae5f3e28b63890439f2a3b6511346 (diff) |
am c014cd6f: Merge "Stop using private APIs in InCallUI" into lmp-dev
* commit 'c014cd6f8e5b41bc253d0dee4da6e595cae0d0c0':
Stop using private APIs in InCallUI
Diffstat (limited to 'InCallUI')
4 files changed, 12 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index a1d6d65b6..933b61a7f 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -231,7 +231,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> // number directly from the telephony layer). PhoneAccountHandle accountHandle = mPrimary.getAccountHandle(); if (accountHandle != null) { - TelecommManager mgr = TelecommManager.from(mContext); + TelecommManager mgr = + (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); PhoneAccount account = mgr.getPhoneAccount(accountHandle); if (account != null) { return account.getSubscriptionNumber(); @@ -272,7 +273,9 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> return; } - String simNumber = TelephonyManager.from(mContext).getLine1Number(); + final TelephonyManager telephonyManager = + (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); + String simNumber = telephonyManager.getLine1Number(); if (!PhoneNumberUtils.compare(callbackNumber, simNumber) && !isEmergencyCall) { Log.d(this, "Numbers are the same; not showing the callback number"); return; @@ -616,7 +619,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private TelecommManager getTelecommManager() { if (mTelecommManager == null) { - mTelecommManager = TelecommManager.from(mContext); + mTelecommManager = + (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); } return mTelecommManager; } diff --git a/InCallUI/src/com/android/incallui/CallVideoClientNotifier.java b/InCallUI/src/com/android/incallui/CallVideoClientNotifier.java index 2c048997f..d1e7f4c14 100644 --- a/InCallUI/src/com/android/incallui/CallVideoClientNotifier.java +++ b/InCallUI/src/com/android/incallui/CallVideoClientNotifier.java @@ -16,8 +16,8 @@ package com.android.incallui; -import com.google.android.collect.Sets; import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import java.util.Set; diff --git a/InCallUI/src/com/android/incallui/SelectPhoneAccountDialogFragment.java b/InCallUI/src/com/android/incallui/SelectPhoneAccountDialogFragment.java index 08152429d..0bc97eda8 100644 --- a/InCallUI/src/com/android/incallui/SelectPhoneAccountDialogFragment.java +++ b/InCallUI/src/com/android/incallui/SelectPhoneAccountDialogFragment.java @@ -56,7 +56,8 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { mIsSelected = false; - mTelecommManager = TelecommManager.from(getActivity()); + mTelecommManager = + (TelecommManager) getActivity().getSystemService(Context.TELECOMM_SERVICE); mAccountHandles = mTelecommManager.getEnabledPhoneAccounts(); final DialogInterface.OnClickListener selectionListener = diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index cdfb5a202..01049d731 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -16,12 +16,13 @@ package com.android.incallui; +import com.google.common.base.Preconditions; + import com.android.incallui.CallVideoClientNotifier.SurfaceChangeListener; import com.android.incallui.CallVideoClientNotifier.VideoEventListener; import com.android.incallui.InCallPresenter.InCallDetailsListener; import com.android.incallui.InCallPresenter.InCallStateListener; import com.android.incallui.InCallPresenter.IncomingCallListener; -import com.android.internal.util.Preconditions; import android.content.Context; import android.telecomm.InCallService.VideoCall; |