commit 5763f7b3c7d109875abb82c41fb2059bf63316dd
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 23 09:05:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 23 09:05:09 2021 +0000
tree f6963753c6d7ea55e0a3852ad0605383e23dbf55
parent 3d95113a95f5c2e6110313c4e8c91e8a75452332
parent 2d1583b2150f49e6f3544eec33898d68286a68e0

[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 2d1583b215 -s ours

am skip reason: Change-Id I9020009ca9e4681c0abc368d58c4d78de51a8987 with SHA-1 361898ca90 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ddcf313fc8c56449e67cddb2be7dd8c448dde95

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();