From 016e9c6a785963770d0fa0063fa02f58d5b2851c Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Wed, 14 Dec 2016 11:24:48 -0800 Subject: [PATCH] Move OTASP_* Consts from ServiceStateTracker to TelephonyManager -Move the OTASP_* constants from SST -Update references to those constants in TelephonyRegistry Bug: 33414487 Test: compilation Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa --- .../java/com/android/server/TelephonyRegistry.java | 3 +-- .../java/android/telephony/TelephonyManager.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 37d8592670ee1..531df81b7126d 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -59,7 +59,6 @@ import com.android.internal.telephony.ITelephonyRegistry; import com.android.internal.telephony.IPhoneStateListener; import com.android.internal.telephony.PhoneConstantConversions; import com.android.internal.telephony.PhoneConstants; -import com.android.internal.telephony.ServiceStateTracker; import com.android.internal.telephony.TelephonyIntents; import com.android.server.am.BatteryStatsService; @@ -171,7 +170,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { private int[] mDataConnectionNetworkType; - private int mOtaspMode = ServiceStateTracker.OTASP_UNKNOWN; + private int mOtaspMode = TelephonyManager.OTASP_UNKNOWN; private ArrayList> mCellInfo = null; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 932c276de7202..b461fe9e51ed2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -124,6 +124,20 @@ public class TelephonyManager { static final int NEVER_USE = 2; } + /** The otaspMode passed to PhoneStateListener#onOtaspChanged */ + /** @hide */ + static public final int OTASP_UNINITIALIZED = 0; + /** @hide */ + static public final int OTASP_UNKNOWN = 1; + /** @hide */ + static public final int OTASP_NEEDED = 2; + /** @hide */ + static public final int OTASP_NOT_NEEDED = 3; + /* OtaUtil has conflict enum 4: OtaUtils.OTASP_FAILURE_SPC_RETRIES */ + /** @hide */ + static public final int OTASP_SIM_UNPROVISIONED = 5; + + private final Context mContext; private final int mSubId; private SubscriptionManager mSubscriptionManager;