PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Chau
2018-02-27 12:02:19 +00:00
committed by Android (Google) Code Review
parent eae1ce5806 8558b593dd
commit ef5fd3c81d
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ApnPreference.java
View File

@@ -16,7 +16,6 @@
package com.android.settings; package com.android.settings;
import static android.provider.Telephony.Carriers.CONTENT_URI;
import static android.provider.Telephony.Carriers.FILTERED_URI; import static android.provider.Telephony.Carriers.FILTERED_URI;
import android.content.ContentUris; import android.content.ContentUris;
@@ -37,7 +36,6 @@ import android.widget.RelativeLayout;
public class ApnPreference extends Preference implements public class ApnPreference extends Preference implements
CompoundButton.OnCheckedChangeListener, OnClickListener { CompoundButton.OnCheckedChangeListener, OnClickListener {
final static String TAG = "ApnPreference"; final static String TAG = "ApnPreference";
private boolean mDpcEnforced = false;
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -121,8 +119,7 @@ public class ApnPreference extends Preference implements
Context context = getContext(); Context context = getContext();
if (context != null) { if (context != null) {
int pos = Integer.parseInt(getKey()); int pos = Integer.parseInt(getKey());
Uri url = ContentUris.withAppendedId( Uri url = ContentUris.withAppendedId(FILTERED_URI, pos);
mDpcEnforced ? FILTERED_URI : CONTENT_URI, pos);
Intent editIntent = new Intent(Intent.ACTION_EDIT, url); Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
editIntent.putExtra(ApnSettings.SUB_ID, mSubId); editIntent.putExtra(ApnSettings.SUB_ID, mSubId);
context.startActivity(editIntent); context.startActivity(editIntent);
@@ -141,8 +138,4 @@ public class ApnPreference extends Preference implements
public void setSubId(int subId) { public void setSubId(int subId) {
mSubId = subId; mSubId = subId;
} }
public void setDpcEnforced(boolean enforced) {
mDpcEnforced = enforced;
}
} }

5
src/com/android/settings/ApnSettings.java
View File

@@ -16,7 +16,6 @@
package com.android.settings; 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.ENFORCE_MANAGED_URI;
import static android.provider.Telephony.Carriers.FILTERED_URI; import static android.provider.Telephony.Carriers.FILTERED_URI;
@@ -292,7 +291,6 @@ public class ApnSettings extends RestrictedSettingsFragment implements
mSelectedKey = getSelectedApnKey(); mSelectedKey = getSelectedApnKey();
cursor.moveToFirst(); cursor.moveToFirst();
boolean enforced = isDpcApnEnforced();
while (!cursor.isAfterLast()) { while (!cursor.isAfterLast()) {
String name = cursor.getString(NAME_INDEX); String name = cursor.getString(NAME_INDEX);
String apn = cursor.getString(APN_INDEX); String apn = cursor.getString(APN_INDEX);
@@ -309,7 +307,6 @@ public class ApnSettings extends RestrictedSettingsFragment implements
pref.setPersistent(false); pref.setPersistent(false);
pref.setOnPreferenceChangeListener(this); pref.setOnPreferenceChangeListener(this);
pref.setSubId(subId); pref.setSubId(subId);
pref.setDpcEnforced(enforced);
boolean selectable = ((type == null) || !type.equals("mms")); boolean selectable = ((type == null) || !type.equals("mms"));
pref.setSelectable(selectable); pref.setSelectable(selectable);
@@ -401,7 +398,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
@Override @Override
public boolean onPreferenceTreeClick(Preference preference) { public boolean onPreferenceTreeClick(Preference preference) {
int pos = Integer.parseInt(preference.getKey()); 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)); startActivity(new Intent(Intent.ACTION_EDIT, url));
return true; return true;
} }