Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 016e9c6a authored by Nathan Harold's avatar Nathan Harold
Browse files

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
parent 5a0618ea

services/core/java/com/android/server/TelephonyRegistry.java

+1 −2
Original line number Diff line number Diff line
@@ -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<List<CellInfo>> mCellInfo = null;

telephony/java/android/telephony/TelephonyManager.java

+14 −0
Original line number Diff line number Diff line
@@ -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;