From 6929616581b8e4cfc069bf28902f613ad0e4433f Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Fri, 24 Mar 2023 13:05:37 +0000
Subject: [PATCH] [Settings] NPE when finish MobileNetworkSettings

Add NPE protection when finish

Bug: 271524675
Test: local test
Change-Id: I74bb54f2e591534b411589c150ce0bd993c2e6dd
---
 .../settings/network/telephony/MobileNetworkSettings.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 0f2d02bfabf..ce8305308c0 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -489,7 +489,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
 
             Iterator<Integer> iterator = mSubscriptionInfoMap.keySet().iterator();
             while (iterator.hasNext()) {
-                if (iterator.next() == mSubId) {
+                if (iterator.next() == mSubId && getActivity() != null) {
                     finishFragment();
                     return;
                 }