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

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

@@ -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

@@ -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) {