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

Merge "Clean up 24Q3 aconfig flag reset_mobile_network_settings" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-15 16:10:40 +00:00
committed by Android (Google) Code Review
parent 068ac9d264 796f631ff8
commit 07bcb127dd
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -108,7 +108,6 @@ android_library {
"fuelgauge-protos-lite", "fuelgauge-protos-lite",
"settings-logtags", "settings-logtags",
"statslog-settings", "statslog-settings",
"telephony_flags_core_java_lib",
"setupdesign-lottie-loading-layout", "setupdesign-lottie-loading-layout",
"device_policy_aconfig_flags_lib", "device_policy_aconfig_flags_lib",
"keyboard_flags_lib", "keyboard_flags_lib",

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

@@ -47,7 +47,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.flags.Flags;
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.network.ResetNetworkRestrictionViewBuilder; import com.android.settings.network.ResetNetworkRestrictionViewBuilder;
@@ -142,13 +141,10 @@ public class ResetNetwork extends InstrumentedFragment {
Context context = getContext(); Context context = getContext();
boolean resetSims = false; boolean resetSims = false;
// TODO(b/317276437) Simplify the logic once flag is released
int resetOptions = ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER int resetOptions = ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER
| ResetNetworkRequest.RESET_VPN_MANAGER; | ResetNetworkRequest.RESET_VPN_MANAGER
if (Flags.resetMobileNetworkSettings()) { | ResetNetworkRequest.RESET_IMS_STACK
resetOptions |= ResetNetworkRequest.RESET_IMS_STACK; | ResetNetworkRequest.RESET_PHONE_PROCESS;
resetOptions |= ResetNetworkRequest.RESET_PHONE_PROCESS;
}
ResetNetworkRequest request = new ResetNetworkRequest(resetOptions); ResetNetworkRequest request = new ResetNetworkRequest(resetOptions);
if (mSubscriptions != null && mSubscriptions.size() > 0) { if (mSubscriptions != null && mSubscriptions.size() > 0) {
int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition(); int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
@@ -156,10 +152,8 @@ public class ResetNetwork extends InstrumentedFragment {
int subId = subscription.getSubscriptionId(); int subId = subscription.getSubscriptionId();
request.setResetTelephonyAndNetworkPolicyManager(subId) request.setResetTelephonyAndNetworkPolicyManager(subId)
.setResetApn(subId); .setResetApn(subId);
if (Flags.resetMobileNetworkSettings()) {
request.setResetImsSubId(subId); request.setResetImsSubId(subId);
} }
}
if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) { if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) {
resetSims = true; resetSims = true;
request.setResetEsim(context.getPackageName()).writeIntoBundle(args); request.setResetEsim(context.getPackageName()).writeIntoBundle(args);