From e4c2cddfaeba71bec29dfad7869ecfebd21ac7ad Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Tue, 25 Feb 2025 08:41:55 +0000
Subject: [PATCH] Add null checker for telephonymanager

Bug: 399023211
Test: atest Enable2gPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I3872ecfff2296cbec9f0ef54ee7cee5a554f111f
---
 .../telephony/Enable2gPreferenceController.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index e941ce547a4..13120a3c907 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -162,8 +162,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
     @Override
     public int getAvailabilityStatus(int subId) {
         if (mTelephonyManager == null) {
-            Log.w(LOG_TAG, "Telephony manager not yet initialized");
-            mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+            Log.w(LOG_TAG, "getAvailabilityStatus: Telephony manager not yet initialized");
+            return CONDITIONALLY_UNAVAILABLE;
         }
         boolean visible =
                 SubscriptionManager.isUsableSubscriptionId(subId)
@@ -189,6 +189,10 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
             return false;
         }
 
+        if (mTelephonyManager == null) {
+            Log.w(LOG_TAG, "isChecked: Telephony manager not yet initialized");
+            return false;
+        }
         long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason(
                 mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G);
         return (currentlyAllowedNetworkTypes & BITMASK_2G) != 0;
@@ -214,6 +218,12 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
         if (!SubscriptionManager.isUsableSubscriptionId(mSubId)) {
             return false;
         }
+
+        if (mTelephonyManager == null) {
+            Log.w(LOG_TAG, "setChecked: Telephony manager not yet initialized");
+            return false;
+        }
+
         long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason(
                 mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G);
         boolean enabled = (currentlyAllowedNetworkTypes & BITMASK_2G) != 0;