commit 29ce646b19a9fc9c39cf85d1e3e3517c7af6398c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 28 18:46:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 28 18:46:09 2024 +0000
tree b72e60a3586a93eb3b56eefa488db2898353b228
parent 9ab3671f2dd15bb54b5236d26f8c9ec7d1eae57b
parent 2354ee6a3d918228a50e8e69702381fe1e2ca574

Merge "Add Call Tracker null check" into main

src/java/com/android/internal/telephony/GsmCdmaPhone.java

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index c4d9a17..8c40e66 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -3039,12 +3039,12 @@
 
     @Override
     public void registerForCallWaiting(Handler h, int what, Object obj) {
-        mCT.registerForCallWaiting(h, what, obj);
+        if (mCT != null) mCT.registerForCallWaiting(h, what, obj);
     }
 
     @Override
     public void unregisterForCallWaiting(Handler h) {
-        mCT.unregisterForCallWaiting(h);
+        if (mCT != null) mCT.unregisterForCallWaiting(h);
     }
 
     /**