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

Commit ef5fd3c8 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix the crash when editing or deleting APN.""

parents eae1ce58 8558b593

src/com/android/settings/ApnPreference.java

+1 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings;



import static android.provider.Telephony.Carriers.CONTENT_URI;

import static android.provider.Telephony.Carriers.FILTERED_URI;



import android.content.ContentUris;
@@ -37,7 +36,6 @@ import android.widget.RelativeLayout; 
public class ApnPreference extends Preference implements

        CompoundButton.OnCheckedChangeListener, OnClickListener {

    final static String TAG = "ApnPreference";

    private boolean mDpcEnforced = false;



    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -121,8 +119,7 @@ public class ApnPreference extends Preference implements 
            Context context = getContext();

            if (context != null) {

                int pos = Integer.parseInt(getKey());

                Uri url = ContentUris.withAppendedId(

                        mDpcEnforced ? FILTERED_URI : CONTENT_URI, pos);

                Uri url = ContentUris.withAppendedId(FILTERED_URI, pos);

                Intent editIntent = new Intent(Intent.ACTION_EDIT, url);

                editIntent.putExtra(ApnSettings.SUB_ID, mSubId);

                context.startActivity(editIntent);
@@ -141,8 +138,4 @@ public class ApnPreference extends Preference implements 
    public void setSubId(int subId) {

        mSubId = subId;

    }



    public void setDpcEnforced(boolean enforced) {

        mDpcEnforced = enforced;

    }

}

src/com/android/settings/ApnSettings.java

+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings;



import static android.provider.Telephony.Carriers.CONTENT_URI;

import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;

import static android.provider.Telephony.Carriers.FILTERED_URI;
@@ -292,7 +291,6 @@ public class ApnSettings extends RestrictedSettingsFragment implements 


            mSelectedKey = getSelectedApnKey();

            cursor.moveToFirst();

            boolean enforced = isDpcApnEnforced();

            while (!cursor.isAfterLast()) {

                String name = cursor.getString(NAME_INDEX);

                String apn = cursor.getString(APN_INDEX);
@@ -309,7 +307,6 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
                pref.setPersistent(false);

                pref.setOnPreferenceChangeListener(this);

                pref.setSubId(subId);

                pref.setDpcEnforced(enforced);



                boolean selectable = ((type == null) || !type.equals("mms"));

                pref.setSelectable(selectable);
@@ -401,7 +398,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
    @Override

    public boolean onPreferenceTreeClick(Preference preference) {

        int pos = Integer.parseInt(preference.getKey());

        Uri url = ContentUris.withAppendedId(isDpcApnEnforced() ? FILTERED_URI : CONTENT_URI, pos);

        Uri url = ContentUris.withAppendedId(FILTERED_URI, pos);

        startActivity(new Intent(Intent.ACTION_EDIT, url));

        return true;

    }