commit 45fb655286e8eebc33b0f4b0bc9c26849b435905
author Chaohui Wang <chaohuiw@google.com> Mon Dec 18 17:22:15 2023 +0800
committer Chaohui Wang <chaohuiw@google.com> Mon Dec 18 18:57:36 2023 +0800
tree 6c97c0ac1b74d12d5deaee2633a66cac41175a80
parent 1ab510bc3c6389ba462235a9083b63566f00bec9

Prevent crash on SIM Lock settings while rotating

Prevent crash when getContext() returns null.

Fix: 316244109
Test: manual - rotating on SIM Lock settings
Change-Id: Iae17585cb52ea74e92129df2a1ced25454678d9a

src/com/android/settings/IccLockSettings.java

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 4628221..422610a 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -52,6 +52,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.TwoStatePreference;
 
@@ -716,13 +717,18 @@
         return slotId;
     }
 
+    @Nullable
     private SubscriptionInfo getVisibleSubscriptionInfoForSimSlotIndex(int slotId) {
         final List<SubscriptionInfo> subInfoList =
                 mProxySubscriptionMgr.getActiveSubscriptionsInfo();
         if (subInfoList == null) {
             return null;
         }
-        final CarrierConfigManager carrierConfigManager = getContext().getSystemService(
+        Context context = getContext();
+        if (context == null) {
+            return null;
+        }
+        final CarrierConfigManager carrierConfigManager = context.getSystemService(
                 CarrierConfigManager.class);
         for (SubscriptionInfo subInfo : subInfoList) {
             if ((isSubscriptionVisible(carrierConfigManager, subInfo)