Merge "Fixed crash issues in Emergency Callback Mode" into main

This commit is contained in:
Treehugger Robot
2025-02-20 03:35:54 -08:00
committed by Android (Google) Code Review
2 changed files with 30 additions and 4 deletions

View File

@@ -59,7 +59,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public void onAttach(Context context) {
super.onAttach(context);
if (isCatalystEnabled()) {
if (!isCatalystEnabled()) {
use(AirplaneModePreferenceController.class).setFragment(this);
}
use(NetworkProviderCallsSmsController.class).init(this);
@@ -104,7 +104,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
switch (requestCode) {
case AirplaneModePreferenceController.REQUEST_CODE_EXIT_ECM:
if (isCatalystEnabled()) {
if (!isCatalystEnabled()) {
use(AirplaneModePreferenceController.class)
.onActivityResult(requestCode, resultCode, data);
}