Merge "Fix APN cannot save after ApnEditor is paused."
am: 052768a8b5
* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
Fix APN cannot save after ApnEditor is paused.
Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
This commit is contained in:
@@ -249,6 +249,21 @@ public class ApnEditor extends InstrumentedPreferenceActivity
|
|||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
|
|
||||||
|
if (mUri == null && mNewApn) {
|
||||||
|
// The URI could have been deleted when activity is paused,
|
||||||
|
// therefore, it needs to be restored.
|
||||||
|
mUri = getContentResolver().insert(getIntent().getData(), new ContentValues());
|
||||||
|
if (mUri == null) {
|
||||||
|
Log.w(TAG, "Failed to insert new telephony provider into "
|
||||||
|
+ getIntent().getData());
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mCursor = managedQuery(mUri, sProjection, null, null);
|
||||||
|
mCursor.moveToFirst();
|
||||||
|
}
|
||||||
|
|
||||||
getPreferenceScreen().getSharedPreferences()
|
getPreferenceScreen().getSharedPreferences()
|
||||||
.registerOnSharedPreferenceChangeListener(this);
|
.registerOnSharedPreferenceChangeListener(this);
|
||||||
}
|
}
|
||||||
@@ -596,6 +611,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
|
|||||||
// If it's a new APN and a name or apn haven't been entered, then erase the entry
|
// If it's a new APN and a name or apn haven't been entered, then erase the entry
|
||||||
if (force && mNewApn && name.length() < 1 && apn.length() < 1) {
|
if (force && mNewApn && name.length() < 1 && apn.length() < 1) {
|
||||||
getContentResolver().delete(mUri, null, null);
|
getContentResolver().delete(mUri, null, null);
|
||||||
|
mUri = null;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user