PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crash on SIM Lock settings while rotating

Browse Source 
Prevent crash when getContext() returns null.

Fix: 316244109
Test: manual - rotating on SIM Lock settings
Change-Id: Iae17585cb52ea74e92129df2a1ced25454678d9a
This commit is contained in:
Chaohui Wang
2023-12-18 17:22:15 +08:00
parent 1ab510bc3c
commit 45fb655286
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/IccLockSettings.java
View File

@@ -52,6 +52,7 @@ import android.widget.TabWidget;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.TwoStatePreference; import androidx.preference.TwoStatePreference;
@@ -716,13 +717,18 @@ public class IccLockSettings extends SettingsPreferenceFragment
return slotId; return slotId;
} }
@Nullable
private SubscriptionInfo getVisibleSubscriptionInfoForSimSlotIndex(int slotId) { private SubscriptionInfo getVisibleSubscriptionInfoForSimSlotIndex(int slotId) {
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
mProxySubscriptionMgr.getActiveSubscriptionsInfo(); mProxySubscriptionMgr.getActiveSubscriptionsInfo();
if (subInfoList == null) { if (subInfoList == null) {
return null; return null;
} }
final CarrierConfigManager carrierConfigManager = getContext().getSystemService( Context context = getContext();
if (context == null) {
return null;
}
final CarrierConfigManager carrierConfigManager = context.getSystemService(
CarrierConfigManager.class); CarrierConfigManager.class);
for (SubscriptionInfo subInfo : subInfoList) { for (SubscriptionInfo subInfo : subInfoList) {
if ((isSubscriptionVisible(carrierConfigManager, subInfo) if ((isSubscriptionVisible(carrierConfigManager, subInfo)