aboutsummaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-01 06:14:59 -0800
committerAndroid Code Review <code-review@android.com>2011-03-01 06:14:59 -0800
commitf8a46731b2f86966399c9d24e095d669ba1a7898 (patch)
tree8522658803d023b6d64e066a41092956ff0cb4bc /telephony
parentab2b59e240f602a83d331ef04a78177c392ca91c (diff)
parente5af8a259e619973538f393011b1c26a3e2f4afb (diff)
downloadexternal_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.zip
external_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.tar.gz
external_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.tar.bz2
Merge "Remove CONFIG_ANDROID_SNAPSHOTS macro."
Diffstat (limited to 'telephony')
-rw-r--r--telephony/android_modem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/telephony/android_modem.c b/telephony/android_modem.c
index 26276bb..437035d 100644
--- a/telephony/android_modem.c
+++ b/telephony/android_modem.c
@@ -2199,16 +2199,14 @@ handleAnswer( const char* cmd, AModem modem )
return NULL;
}
-#if CONFIG_ANDROID_SNAPSHOTS
int android_snapshot_update_time = 1;
int android_snapshot_update_time_request = 0;
-#endif
static const char*
handleSignalStrength( const char* cmd, AModem modem )
{
amodem_begin_line( modem );
-#if CONFIG_ANDROID_SNAPSHOTS
+
/* Sneak time updates into the SignalStrength request, because it's periodic.
* Ideally, we'd be able to prod the guest into asking immediately on restore
* from snapshot, but that'd require a driver.
@@ -2217,7 +2215,7 @@ handleSignalStrength( const char* cmd, AModem modem )
amodem_addTimeUpdate( modem );
android_snapshot_update_time_request = 0;
}
-#endif
+
// rssi = 0 (<-113dBm) 1 (<-111) 2-30 (<-109--53) 31 (>=-51) 99 (?!)
// ber (bit error rate) - always 99 (unknown), apparently.
// TODO: return 99 if modem->radio_state==A_RADIO_STATE_OFF, once radio_state is in snapshot.