summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorWink Saville <>2009-04-02 01:37:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-02 01:37:03 -0700
commit56469d57db5e34913ec2ad1d28440ddfad9363a0 (patch)
tree62e793929d1e30d435967d75f27695a420c6e1eb /src/com/android
parentead5740577781f4b5a14dc77dfa15b47fee282bb (diff)
downloadStk-56469d57db5e34913ec2ad1d28440ddfad9363a0.tar.gz
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/stk/StkAppService.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 136bc71..fae072d 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -28,6 +28,7 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.telephony.TelephonyManager;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -135,7 +136,14 @@ public class StkAppService extends Service implements Runnable {
// Initialize members
mStkService = com.android.internal.telephony.gsm.stk.StkService
.getInstance();
- if (mStkService == null) {
+
+ // WINK:TODO: Teleca, the test for PHONE_TYPE_CDMA is needed so the
+ // application will boot. This is probably a bug in
+ // and Wink has been assigned a bug to investigate.
+ //
+ if ((mStkService == null)
+ && (TelephonyManager.getDefault().getPhoneType()
+ != TelephonyManager.PHONE_TYPE_CDMA)) {
StkLog.d(this, " Unable to get Service handle");
return;
}
@@ -741,3 +749,4 @@ public class StkAppService extends Service implements Runnable {
return false;
}
}
+