filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide APN prefs if platform APIs are used

Browse Source 
The APN prefs is available if legacy APIs are used with local APN db
only.

Test: Manual

Change-Id: I5883dcb2c406acc601787edd02e0d3272732e6d7
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
This commit is contained in:
Taesu Lee
2020-05-04 17:00:36 +09:00
parent 116073d016
commit 95ceb12cdb
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
View File

@@ -28,10 +28,12 @@ import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
import androidx.core.app.NavUtils;
import android.text.TextUtils;
import android.view.MenuItem;
import androidx.appcompat.mms.MmsManager;
import androidx.core.app.NavUtils;
import com.android.messaging.Factory;
import com.android.messaging.R;
import com.android.messaging.datamodel.ParticipantRefresh;
@@ -159,17 +161,18 @@ public class PerSubscriptionSettingsActivity extends BugleActionBarActivity {
}
// Access Point Names (APNs)
final Preference apnsPref = findPreference(getString(R.string.sms_apns_key));
final PreferenceScreen apnsScreen =
(PreferenceScreen) findPreference(getString(R.string.sms_apns_key));
if (MmsUtils.useSystemApnTable() && !ApnDatabase.doesDatabaseExist()) {
// Don't remove the ability to edit the local APN prefs if this device lets us
if (!MmsManager.shouldUseLegacyMms()
|| (MmsUtils.useSystemApnTable() && !ApnDatabase.doesDatabaseExist())) {
// 1) Remove the ability to edit the local APN prefs if it doesn't use legacy APIs.
// 2) Don't remove the ability to edit the local APN prefs if this device lets us
// access the system APN, but we can't find the MCC/MNC in the APN table and we
// created the local APN table in case the MCC/MNC was in there. In other words,
// if the local APN table exists, let the user edit it.
advancedCategory.removePreference(apnsPref);
advancedCategory.removePreference((Preference) apnsScreen);
} else {
final PreferenceScreen apnsScreen = (PreferenceScreen) findPreference(
getString(R.string.sms_apns_key));
apnsScreen.setIntent(UIIntents.get()
.getApnSettingsIntent(getPreferenceScreen().getContext(), mSubId));
}