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

Commit e68a8c49 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] subscription UI should be closed when SIM is removed" am:... 

Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585 am: 5dba10a9 am: 5975853b am: 0f2bc3ba

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I2828a05151f0d5dc0a1ba314b15d0ec89710772f
parents df5b0a4c 0f2bc3ba

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

+5 −0
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ public class MobileNetworkActivity extends SettingsBaseActivity 


        // Remove the dialog if the subscription associated with this activity changes.

        if (info == null) {

            // Close the activity when subscription removed

            if ((oldSubIndex != SUB_ID_NULL)

                    && (!isFinishing()) && (!isDestroyed())) {

                finish();

            }

            return;

        }

        int subIndex = info.getSubscriptionId();