commit 016e9c6a785963770d0fa0063fa02f58d5b2851c
author Nathan Harold <nharold@google.com> Wed Dec 14 11:24:48 2016 -0800
committer Nathan Harold <nharold@google.com> Fri Mar 03 10:10:08 2017 -0800
tree 4f0eee367a07781352d7fc28ee9f273a2af21b82
parent 5a0618ead121b258204c19b97c37cb85d4ad0856

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

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

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 37d8592..531df81 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.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 @@
 
     private int[] mDataConnectionNetworkType;
 
-    private int mOtaspMode = ServiceStateTracker.OTASP_UNKNOWN;
+    private int mOtaspMode = TelephonyManager.OTASP_UNKNOWN;
 
     private ArrayList<List<CellInfo>> mCellInfo = null;