Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda2f43f authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Adjust the finish procedure when launching Settings UI"

parents 7ced3c18 8cde9810

src/com/android/settings/network/MobileNetworkListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class MobileNetworkListFragment extends DashboardFragment { 
    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        if (!SubscriptionUtil.isSimHardwareVisible(getContext())) {

            finishFragment();

            finish();

            return controllers;

        }

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { 
    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        if (!SubscriptionUtil.isSimHardwareVisible(context)) {

            finishFragment();

            finish();

            return Arrays.asList();

        }

        if (getArguments() == null) {