commit ebf284123d9732a93353b71fa6fa7220af6df116
author jackqdyulei <jackqdyulei@google.com> Fri Sep 21 13:47:39 2018 -0700
committer Lei Yu <jackqdyulei@google.com> Fri Sep 21 22:13:37 2018 +0000
tree 5c77eb3f30069f999e798597c4b659f168f5e217
parent cb703923807aaecaaa75851588e8a558c19e5a45

Remove internal dependency for PhoneGlobals/Phone

PhoneGlobals
1. Use CarrierConfigManager.getConfigForSubId() to get carrierConfig
2. Use Toast directly instead of using method in NotificationMgr

Phone
1. Use mTelephonyManager.getPhoneType() to get phoneType

Bug: 115429509
Test: Manual
Change-Id: I7433cda35a3564a6549c56bc7cd087281dda31d5

src/com/android/phone/RoamingDialogFragment.java

diff --git a/src/com/android/phone/RoamingDialogFragment.java b/src/com/android/phone/RoamingDialogFragment.java
index d24967b..384a120 100644
--- a/src/com/android/phone/RoamingDialogFragment.java
+++ b/src/com/android/phone/RoamingDialogFragment.java
@@ -35,6 +35,7 @@
 
     public static final String SUB_ID_KEY = "sub_id_key";
 
+    private CarrierConfigManager mCarrierConfigManager;
     private int mSubId;
 
     /**
@@ -52,6 +53,7 @@
         super.onAttach(context);
         Bundle args = getArguments();
         mSubId = args.getInt(SUB_ID_KEY);
+        mCarrierConfigManager = new CarrierConfigManager(context);
 
         // Verify host activity implemented callback interface
         FragmentManager fragmentManager = getFragmentManager();
@@ -68,8 +70,7 @@
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         int title = R.string.roaming_alert_title;
-        PersistableBundle carrierConfig =
-                PhoneGlobals.getInstance().getCarrierConfigForSubId(mSubId);
+        PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
         if (carrierConfig != null && carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
             title = R.string.roaming_check_price_warning;