commit 679fc544657976d2eccd65aa5b2a1ce2e7cc5d9b
author Brad Ebinger <breadley@google.com> Fri Feb 26 04:15:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 26 04:15:09 2021 +0000
tree ffab139c961f689d736756444609fa2c9f006d81
parent da75193755ba4d85212e769d94a74a01ddb26a22
parent 9122c4bb012f61d48ded22b9aac93f8cca334e99

Merge "Bettern handle NPE in RcsTestApp ChatActivity" am: cbc2202ae6 am: 9122c4bb01

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1607016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaf1203810f2ac6640added9ff41fcf3dda26237

src/com/android/phone/otasp/OtaspActivationService.java

diff --git a/src/com/android/phone/otasp/OtaspActivationService.java b/src/com/android/phone/otasp/OtaspActivationService.java
index 6ed2ea8..72bf249 100644
--- a/src/com/android/phone/otasp/OtaspActivationService.java
+++ b/src/com/android/phone/otasp/OtaspActivationService.java
@@ -31,6 +31,7 @@
 import com.android.internal.telephony.GsmCdmaConnection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.ServiceStateTracker;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.PhoneUtils;
 
@@ -77,6 +78,11 @@
     public void onCreate() {
         logd("otasp service onCreate");
         mPhone = PhoneGlobals.getPhone();
+        ServiceStateTracker sst = mPhone.getServiceStateTracker();
+        if (sst != null && sst.getOtasp() != TelephonyManager.OTASP_NEEDED) {
+            logd("OTASP is not needed.");
+            return;
+        }
         if ((sIccId == null) || !sIccId.equals(mPhone.getIccSerialNumber())) {
             // reset to allow activation retry on new sim
             sIccId = mPhone.getIccSerialNumber();