From 4b575ec0d12a45f4df90b4bca8740d63f6817e43 Mon Sep 17 00:00:00 2001 From: hoffc Date: Mon, 27 Apr 2020 13:40:12 +0800 Subject: [PATCH] Settings: Fix force close when destory sim lock fragment view Sim lock fragment does not override its parent onCreateView method and diretly return null, which results in NPE when destory after removing Sim card. Override its parent onCreateView when no sim card inserted. Bug: 154743278 Test: build pass Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 --- src/com/android/settings/IccLockSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index dea915aad0b..2ee804e237e 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -246,7 +246,7 @@ public class IccLockSettings extends SettingsPreferenceFragment if (componenterList.size() == 0) { Log.e(TAG, "onCreateView: no sim info"); - return null; + return super.onCreateView(inflater, container, savedInstanceState); } if (componenterList.size() > 1) {