am 3440a8d4: am c016b039: am c014cd6f: Merge "Stop using private APIs in InCallUI" into lmp-dev

* commit '3440a8d49c23678d52175b27654762af842399d3':
  Stop using private APIs in 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;