am 0dc8618d: Do not start RILReceiver if wifi-only.

* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
This commit is contained in:
Wink Saville
2011-02-24 10:50:31 -08:00
committed by Android Git Automerger

View File

@@ -244,6 +244,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
Object mLastNITZTimeInfo; Object mLastNITZTimeInfo;
private static final String WIFI_ONLY_CARRIER = "wifi-only";
//***** Events //***** Events
static final int EVENT_SEND = 1; static final int EVENT_SEND = 1;
@@ -656,6 +658,13 @@ public final class RIL extends BaseCommands implements CommandsInterface {
Looper looper = mSenderThread.getLooper(); Looper looper = mSenderThread.getLooper();
mSender = new RILSender(looper); mSender = new RILSender(looper);
// TODO: Provide a common API for determining if a
// device is wifi-only. bug: 3480713
String carrier = SystemProperties.get("ro.carrier");
if (WIFI_ONLY_CARRIER.equals(carrier)) {
riljLog("Not starting RILReceiver: wifi-only");
} else {
riljLog("Starting RILReceiver");
mReceiver = new RILReceiver(); mReceiver = new RILReceiver();
mReceiverThread = new Thread(mReceiver, "RILReceiver"); mReceiverThread = new Thread(mReceiver, "RILReceiver");
mReceiverThread.start(); mReceiverThread.start();
@@ -665,6 +674,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_OFF);
context.registerReceiver(mIntentReceiver, filter); context.registerReceiver(mIntentReceiver, filter);
} }
}
//***** CommandsInterface implementation //***** CommandsInterface implementation