commit efe56aeb3dfda08031078fc3d10f287a804a5082
author tom hsu <tomhsu@google.com> Sat Jan 16 05:39:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 16 05:39:26 2021 +0000
tree fe7ab44df8aae5ea5fb90d3249583571cb670040
parent 710705d0610e4c0a9ece8745d237bdaa861daf07
parent 0aa4089f459d48ef73a198b1bb2ef87d40477c2d

Add otasp mode check to avoid any unnecessary otasp call. am: 0aa4089f45

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf6500dbbc9c77aaeca9e83cae83d185ebfac853

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