Test APNs
Add test APNs to carriers table. Enable APN Setting editing for testing PLMNs. Allow user to toggle carrier_enabled for test APNs. Bug: 17136661 Change-Id: Ieabfac5ea02a5b9971c7050d8278ad0095863e3a
This commit is contained in:
committed by
Vineeta Srivastava
parent
ddc9b2ce23
commit
f04d69a1d4
21
res/values-mcc001-mnc01/config.xml
Executable file
21
res/values-mcc001-mnc01/config.xml
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2007 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">true</bool>
|
||||||
|
</resources>
|
21
res/values-mcc001-mnc010/config.xml
Executable file
21
res/values-mcc001-mnc010/config.xml
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2007 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">true</bool>
|
||||||
|
</resources>
|
21
res/values-mcc246-mnc081/config.xml
Executable file
21
res/values-mcc246-mnc081/config.xml
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2007 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">true</bool>
|
||||||
|
</resources>
|
21
res/values-mcc310-mnc028/config.xml
Executable file
21
res/values-mcc310-mnc028/config.xml
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2007 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">true</bool>
|
||||||
|
</resources>
|
21
res/values-mcc311-mnc390/config.xml
Executable file
21
res/values-mcc311-mnc390/config.xml
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2007 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">true</bool>
|
||||||
|
</resources>
|
@@ -32,4 +32,6 @@
|
|||||||
<!-- Dashboard number of columns -->
|
<!-- Dashboard number of columns -->
|
||||||
<integer name="dashboard_num_columns">1</integer>
|
<integer name="dashboard_num_columns">1</integer>
|
||||||
|
|
||||||
|
<!-- Carrier_enabled editable -->
|
||||||
|
<bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -327,6 +327,13 @@ public class ApnEditor extends PreferenceActivity
|
|||||||
mMvnoType.setSummary(
|
mMvnoType.setSummary(
|
||||||
checkNull(mvnoDescription(mMvnoType.getValue())));
|
checkNull(mvnoDescription(mMvnoType.getValue())));
|
||||||
mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
|
mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
|
||||||
|
// allow user to edit carrier_enabled for some APN
|
||||||
|
boolean ceEditable = getResources().getBoolean(R.bool.config_allow_edit_carrier_enabled);
|
||||||
|
if (ceEditable) {
|
||||||
|
mCarrierEnabled.setEnabled(true);
|
||||||
|
} else {
|
||||||
|
mCarrierEnabled.setEnabled(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -571,6 +578,7 @@ public class ApnEditor extends PreferenceActivity
|
|||||||
values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
|
values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
|
||||||
values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));
|
values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));
|
||||||
|
|
||||||
|
values.put(Telephony.Carriers.CARRIER_ENABLED, mCarrierEnabled.isChecked() ? 1 : 0);
|
||||||
getContentResolver().update(mUri, values, null, null);
|
getContentResolver().update(mUri, values, null, null);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -664,6 +672,8 @@ public class ApnEditor extends PreferenceActivity
|
|||||||
if (pref != null) {
|
if (pref != null) {
|
||||||
if (pref.equals(mPassword)){
|
if (pref.equals(mPassword)){
|
||||||
pref.setSummary(starify(sharedPreferences.getString(key, "")));
|
pref.setSummary(starify(sharedPreferences.getString(key, "")));
|
||||||
|
} else if (pref.equals(mCarrierEnabled)) {
|
||||||
|
// do nothing
|
||||||
} else {
|
} else {
|
||||||
pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
|
pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user