summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chaohui Wang <chaohuiw@google.com> 2023-12-18 17:22:15 +0800
committer Chaohui Wang <chaohuiw@google.com> 2023-12-18 18:57:36 +0800
commit45fb655286e8eebc33b0f4b0bc9c26849b435905 (patch)
tree6c97c0ac1b74d12d5deaee2633a66cac41175a80
parent1ab510bc3c6389ba462235a9083b63566f00bec9 (diff)
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
-rw-r--r--src/com/android/settings/IccLockSettings.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 4628221c323..422610a4856 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -52,6 +52,7 @@ import android.widget.TabWidget;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
@@ -716,13 +717,18 @@ public class IccLockSettings extends SettingsPreferenceFragment
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)