diff options
| author | Wink Saville <wink@google.com> | 2012-07-11 18:15:50 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-07-11 18:15:50 -0700 |
| commit | 5362f17ff5e8e06601b172bd86c26027ced9780c (patch) | |
| tree | 5d42b9b05f148cd90cd0613655a66ede573a3db5 /services/java/com/android/server/connectivity/Tethering.java | |
| parent | f16336790bca9d3e946553f2e5a16e14bb9dbc3e (diff) | |
| parent | 1b003ef05fad1fbdad9674feda9cc1731c7d99dd (diff) | |
Merge commit '1b003ef0' into mit
* commit '1b003ef0':
Create telephony-common and mms-common
Change-Id: Ie8876541dbe7f4c933cf7d69910dd204538bc975
Diffstat (limited to 'services/java/com/android/server/connectivity/Tethering.java')
| -rw-r--r-- | services/java/com/android/server/connectivity/Tethering.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 00832eefdd10..5aa3a29052f4 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -47,6 +47,7 @@ import android.provider.Settings; import android.util.Log; import com.android.internal.telephony.Phone; +import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.IState; import com.android.internal.util.State; import com.android.internal.util.StateMachine; @@ -1195,7 +1196,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { boolean retValue = true; if (apnType == ConnectivityManager.TYPE_NONE) return false; if (apnType != mMobileApnReserved) turnOffUpstreamMobileConnection(); - int result = Phone.APN_REQUEST_FAILED; + int result = PhoneConstants.APN_REQUEST_FAILED; String enableString = enableString(apnType); if (enableString == null) return false; try { @@ -1204,14 +1205,14 @@ public class Tethering extends INetworkManagementEventObserver.Stub { } catch (Exception e) { } switch (result) { - case Phone.APN_ALREADY_ACTIVE: - case Phone.APN_REQUEST_STARTED: + case PhoneConstants.APN_ALREADY_ACTIVE: + case PhoneConstants.APN_REQUEST_STARTED: mMobileApnReserved = apnType; Message m = obtainMessage(CMD_CELL_CONNECTION_RENEW); m.arg1 = ++mCurrentConnectionSequence; sendMessageDelayed(m, CELL_CONNECTION_RENEW_MS); break; - case Phone.APN_REQUEST_FAILED: + case PhoneConstants.APN_REQUEST_FAILED: default: retValue = false; break; |