commit 8a512ca7b4f99415244d6068f5e2362303e956ff
author Bonian Chen <bonianchen@google.com> Mon Dec 09 13:39:27 2019 +0800
committer Bonian Chen <bonianchen@google.com> Mon Dec 09 13:39:27 2019 +0800
tree 6cca5b487a53dfc4af00fad6c5af1ce7231d213b
parent efa2229556f515d6fca4e9d12cb28433325c17b2

[Settings] Fix crash when no SIM

Airplane mode enabler exception under the condition of
no active subscription. This is due to incorrect null pointer
checking within source code.

Bug: 145830780
Test: manual
Change-Id: I47cb4d82b7b99b4c34270023cd58f479347477da

src/com/android/settings/AirplaneModeEnabler.java

diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index c6ab58e..64ad17d 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -97,7 +97,7 @@
         mServiceStateListeners.add(new ServiceStateListener(mTelephonyManager,
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID, this));
 
-        if (subInfoList == null) {
+        if (subInfoList != null) {
             for (SubscriptionInfo subInfo : subInfoList) {
                 mServiceStateListeners.add(new ServiceStateListener(mTelephonyManager,
                         subInfo.getSubscriptionId(), this));