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

Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev

Browse Source
This commit is contained in:
Amit Mahajan
2017-07-20 20:47:12 +00:00
committed by Android (Google) Code Review
parent 390bb3216d 313c940080
commit c2b12c5304
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ApnEditor.java
View File

@@ -147,7 +147,8 @@ public class ApnEditor extends SettingsPreferenceFragment
Telephony.Carriers.ROAMING_PROTOCOL, // 20 Telephony.Carriers.ROAMING_PROTOCOL, // 20
Telephony.Carriers.MVNO_TYPE, // 21 Telephony.Carriers.MVNO_TYPE, // 21
Telephony.Carriers.MVNO_MATCH_DATA, // 22 Telephony.Carriers.MVNO_MATCH_DATA, // 22
Telephony.Carriers.EDITED // 23 Telephony.Carriers.EDITED, // 23
Telephony.Carriers.USER_EDITABLE //24
}; };
private static final int ID_INDEX = 0; private static final int ID_INDEX = 0;
@@ -173,6 +174,7 @@ public class ApnEditor extends SettingsPreferenceFragment
private static final int MVNO_TYPE_INDEX = 21; private static final int MVNO_TYPE_INDEX = 21;
private static final int MVNO_MATCH_DATA_INDEX = 22; private static final int MVNO_MATCH_DATA_INDEX = 22;
private static final int EDITED_INDEX = 23; private static final int EDITED_INDEX = 23;
private static final int USER_EDITABLE_INDEX = 24;
@Override @Override
@@ -284,7 +286,8 @@ public class ApnEditor extends SettingsPreferenceFragment
Log.d(TAG, "onCreate: EDITED " + mCursor.getInt(EDITED_INDEX)); Log.d(TAG, "onCreate: EDITED " + mCursor.getInt(EDITED_INDEX));
// if it's not a USER_EDITED apn, check if it's read-only // if it's not a USER_EDITED apn, check if it's read-only
if (mCursor.getInt(EDITED_INDEX) != Telephony.Carriers.USER_EDITED && if (mCursor.getInt(EDITED_INDEX) != Telephony.Carriers.USER_EDITED &&
apnTypesMatch(mReadOnlyApnTypes, mCursor.getString(TYPE_INDEX))) { (mCursor.getInt(USER_EDITABLE_INDEX) == 0 ||
apnTypesMatch(mReadOnlyApnTypes, mCursor.getString(TYPE_INDEX)))) {
Log.d(TAG, "onCreate: apnTypesMatch; read-only APN"); Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
mReadOnlyApn = true; mReadOnlyApn = true;
disableAllFields(); disableAllFields();