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

Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457

Browse Source 
Change-Id: I11597c7d826e767269016d6c3bf1d8c84462b315
This commit is contained in:
Automerger Merge Worker
2020-03-11 02:20:10 +00:00
parent 1dd17f9d7a d0d3fd6457
commit 4f02905051
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/ResetNetwork.java
View File

@@ -40,11 +40,9 @@ import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -121,7 +119,8 @@ public class ResetNetwork extends InstrumentedFragment {
if (mSubscriptions != null && mSubscriptions.size() > 0) { if (mSubscriptions != null && mSubscriptions.size() > 0) {
int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition(); int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
SubscriptionInfo subscription = mSubscriptions.get(selectedIndex); SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);
args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId()); args.putInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
subscription.getSubscriptionId());
} }
args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA, args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA,
mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()); mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());
@@ -170,13 +169,13 @@ public class ResetNetwork extends InstrumentedFragment {
if (mSubscriptions != null && mSubscriptions.size() > 0) { if (mSubscriptions != null && mSubscriptions.size() > 0) {
// Get the default subscription in the order of data, voice, sms, first up. // Get the default subscription in the order of data, voice, sms, first up.
int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId(); int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId();
} }
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId();
} }
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) { if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
defaultSubscription = SubscriptionManager.getDefaultSubscriptionId(); defaultSubscription = SubscriptionManager.getDefaultSubscriptionId();
} }

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

@@ -47,7 +47,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings; import com.android.settings.network.ApnSettings;
@@ -199,7 +198,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
private void restoreDefaultApn(Context context) { private void restoreDefaultApn(Context context) {
Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI); Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
if (SubscriptionManager.isUsableSubIdValue(mSubId)) { if (SubscriptionManager.isUsableSubscriptionId(mSubId)) {
uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId)); uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
} }
@@ -250,7 +249,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
Bundle args = getArguments(); Bundle args = getArguments();
if (args != null) { if (args != null) {
mSubId = args.getInt(PhoneConstants.SUBSCRIPTION_KEY, mSubId = args.getInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA); mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
} }