Merge "[Settings] configuration for hidding SIM notification UI"

src/com/android/settings/sim/SimDialogActivity.java

@@ -35,6 +35,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
 
 import java.util.List;
@@ -65,6 +66,11 @@ public class SimDialogActivity extends FragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (!SubscriptionUtil.isSimHardwareVisible(this)) {
+            Log.d(TAG, "Not support on device without SIM.");
+            finish();
+            return;
+        }
         getWindow().addSystemFlags(
                 WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         showOrUpdateDialog();

src/com/android/settings/sim/SimSelectNotification.java

@@ -77,6 +77,10 @@ public class SimSelectNotification extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
+            Log.w(TAG, "Received unexpected intent with null action.");
+            return;
+        }
         String action = intent.getAction();
 
         if (action == null) {

src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java

@@ -38,6 +38,7 @@ import androidx.core.content.ContextCompat;
 
 import com.android.settings.R;
 import com.android.settings.core.SettingsBaseActivity;
+import com.android.settings.network.SubscriptionUtil;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -48,6 +49,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Executors;
 
 public class SmartForwardingActivity extends SettingsBaseActivity {
+    static final String LOG_TAG = SmartForwardingActivity.class.toString();
     final ListeningExecutorService service =
             MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
 
@@ -55,6 +57,12 @@ public class SmartForwardingActivity extends SettingsBaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (!SubscriptionUtil.isSimHardwareVisible(this)) {
+            Log.d(LOG_TAG, "Not support on device without SIM.");
+            finish();
+            return;
+        }
+
         final Toolbar toolbar = findViewById(R.id.action_bar);
         toolbar.setVisibility(View.VISIBLE);
         setActionBar(toolbar);
@@ -166,4 +174,4 @@ public class SmartForwardingActivity extends SettingsBaseActivity {
                 .create();
         mDialog.show();
     }
-}
+}