Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
  Do not start RILReceiver if wifi-only.
This commit is contained in:
Wink Saville
2011-02-24 10:52:53 -08:00
committed by Android Git Automerger
parent b5b85a9416 ee38808dcc
commit df3c4b45c8
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/com/android/internal/telephony/RIL.java
View File

@@ -244,6 +244,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
Object mLastNITZTimeInfo;
private static final String WIFI_ONLY_CARRIER = "wifi-only";
//***** Events
static final int EVENT_SEND = 1;
@@ -654,14 +656,22 @@ public final class RIL extends BaseCommands implements CommandsInterface {
Looper looper = mSenderThread.getLooper();
mSender = new RILSender(looper);
mReceiver = new RILReceiver();
mReceiverThread = new Thread(mReceiver, "RILReceiver");
mReceiverThread.start();
// 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();
mReceiverThread = new Thread(mReceiver, "RILReceiver");
mReceiverThread.start();
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_ON);
filter.addAction(Intent.ACTION_SCREEN_OFF);
context.registerReceiver(mIntentReceiver, filter);
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_ON);
filter.addAction(Intent.ACTION_SCREEN_OFF);
context.registerReceiver(mIntentReceiver, filter);
}
}
//***** CommandsInterface implementation