Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72cedc7a authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of... 

am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev

* commit 'c4cc07b2':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
parents cff282f3 c4cc07b2

src/com/android/settings/ApnSettings.java

+4 −6
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.TelephonyProperties;

import android.telephony.TelephonyManager;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -132,8 +131,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
    public void onCreate(Bundle icicle) {

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        super.onCreate(icicle);

        final Activity activity = getActivity();

        final Activity activity = getActivity();

        // Fixme: Workaround for single sim device.

        final int subId = activity.getIntent().getIntExtra("sub_id", -1);

        mSubscriptionInfo = Utils.findRecordBySlotId(activity, 0);





        mUm = (UserManager) getSystemService(Context.USER_SERVICE);

        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -144,6 +142,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
            setHasOptionsMenu(true);

            setHasOptionsMenu(true);

        }

        }





        mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);

    }

    }





    @Override

    @Override
@@ -203,10 +202,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
    }

    }





    private void fillList() {

    private void fillList() {

        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

        final String mccmnc = mSubscriptionInfo == null ? ""

        final String mccmnc = mSubscriptionInfo == null ? ""

              : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());

            : Integer.toString(mSubscriptionInfo.getMcc())

        Log.d(TAG, "mccmnc = " + mccmnc);

                + Integer.toString(mSubscriptionInfo.getMnc());

        final String where = "numeric=\""

        final String where = "numeric=\""

            + mccmnc

            + mccmnc

            + "\"";

            + "\"";