diff options
| author | Elliott Hughes <enh@google.com> | 2009-10-02 12:31:08 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2009-10-02 12:31:08 -0700 |
| commit | 82583b8312403ed734c30b161750d40c26086ee2 (patch) | |
| tree | fb510cabfa7f2504003c8943071823d99b899126 | |
| parent | 88d32062bcb8a65aada1873dc0dfc2b60c22f426 (diff) | |
| download | frameworks_base-82583b8312403ed734c30b161750d40c26086ee2.zip frameworks_base-82583b8312403ed734c30b161750d40c26086ee2.tar.gz frameworks_base-82583b8312403ed734c30b161750d40c26086ee2.tar.bz2 | |
Remove last vestiges of adb networking support.
Bug: 1122968
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java | 10 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/gsm/GSMPhone.java | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index 6dcfcd9..b42cfef 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -561,15 +561,7 @@ public class CDMAPhone extends PhoneBase { public DataState getDataConnectionState() { DataState ret = DataState.DISCONNECTED; - if ((SystemProperties.get("adb.connected", "").length() > 0) - && (SystemProperties.get("android.net.use-adb-networking", "") - .length() > 0)) { - // We're connected to an ADB host and we have USB networking - // turned on. No matter what the radio state is, - // we report data connected - - ret = DataState.CONNECTED; - } else if (mSST == null) { + if (mSST == null) { // Radio Technology Change is ongoning, dispose() and removeReferences() have // already been called diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index 5614c12..82e8399 100755 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -293,15 +293,7 @@ public class GSMPhone extends PhoneBase { public DataState getDataConnectionState() { DataState ret = DataState.DISCONNECTED; - if ((SystemProperties.get("adb.connected", "").length() > 0) - && (SystemProperties.get("android.net.use-adb-networking", "") - .length() > 0)) { - // We're connected to an ADB host and we have USB networking - // turned on. No matter what the radio state is, - // we report data connected - - ret = DataState.CONNECTED; - } else if (mSST == null) { + if (mSST == null) { // Radio Technology Change is ongoning, dispose() and removeReferences() have // already been called |