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

Commit 09c9e5eb authored by Mick Lin's avatar Mick Lin Committed by Leo Wang
Browse files

[DS] Correct the access method for telephony system property 

    Bug: 18675498

    Review: https://partner-android-review.git.corp.google.com/#/c/198822

Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7
parent 9c167e92

src/com/android/settings/ApnEditor.java

+5 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.preference.Preference; 
import android.preference.PreferenceActivity;

import android.preference.SwitchPreference;

import android.provider.Telephony;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.view.KeyEvent;
@@ -94,6 +95,7 @@ public class ApnEditor extends PreferenceActivity 
    private Cursor mCursor;

    private boolean mNewApn;

    private boolean mFirstTime;

    private int mSubId;

    private Resources mRes;

    private TelephonyManager mTelephonyManager;
@@ -191,6 +193,7 @@ public class ApnEditor extends PreferenceActivity 


        final Intent intent = getIntent();

        final String action = intent.getAction();

        mSubId = intent.getIntExtra("sub_id", SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        mFirstTime = icicle == null;
@@ -263,8 +266,7 @@ public class ApnEditor extends PreferenceActivity 
            mMnc.setText(mCursor.getString(MNC_INDEX));

            mApnType.setText(mCursor.getString(TYPE_INDEX));

            if (mNewApn) {

                String numeric =

                    SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);

                String numeric = mTelephonyManager.getSimOperator(mSubId);

                // MCC is first 3 chars and then in 2 - 3 chars of MNC

                if (numeric != null && numeric.length() > 4) {

                    // Country code
@@ -387,8 +389,7 @@ public class ApnEditor extends PreferenceActivity 
                if (values[mvnoIndex].equals("SPN")) {

                    mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());

                } else if (values[mvnoIndex].equals("IMSI")) {

                    String numeric =

                            SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);

                    String numeric = mTelephonyManager.getSimOperator(mSubId);

                    mMvnoMatchData.setText(numeric + "x");

                } else if (values[mvnoIndex].equals("GID")) {

                    mMvnoMatchData.setText(mTelephonyManager.getGroupIdLevel1());

src/com/android/settings/ApnSettings.java

+8 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.preference.PreferenceGroup; 
import android.preference.PreferenceScreen;

import android.provider.Telephony;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -132,7 +133,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        final Activity activity = getActivity();

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

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

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -287,7 +289,11 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
    }



    private void addNewApn() {

        startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));

        Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);

        int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()

                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        intent.putExtra("sub_id", subId);

        startActivity(intent);

    }



    @Override