summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2009-06-02 00:50:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-02 00:50:17 -0700
commit06acde651d7ee8855795d1b20cf31f2cb45e4140 (patch)
tree7cf5d5d547d82aa9c94bcf514d16b217834ec7a7
parentdeba80b465bf8e4bab8ee198949c3e0710f0d144 (diff)
parent36eddd5bfa9047a6b9de2be4a5d6636b81634f97 (diff)
downloadStk-06acde651d7ee8855795d1b20cf31f2cb45e4140.tar.gz
am 36eddd5b: Update comment in onCreate.
Merge commit '36eddd5bfa9047a6b9de2be4a5d6636b81634f97' * commit '36eddd5bfa9047a6b9de2be4a5d6636b81634f97': Update comment in onCreate.
-rw-r--r--src/com/android/stk/StkAppService.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index fae072d..d7eabd8 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -136,11 +136,11 @@ public class StkAppService extends Service implements Runnable {
// Initialize members
mStkService = com.android.internal.telephony.gsm.stk.StkService
.getInstance();
-
- // 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.
- //
+
+ // NOTE mStkService is a singleton and continues to exist even if the GSMPhone is disposed
+ // after the radio technology change from GSM to CDMA so the PHONE_TYPE_CDMA check is
+ // needed. In case of switching back from CDMA to GSM the GSMPhone constructor updates
+ // the instance. (TODO: test).
if ((mStkService == null)
&& (TelephonyManager.getDefault().getPhoneType()
!= TelephonyManager.PHONE_TYPE_CDMA)) {
@@ -749,4 +749,3 @@ public class StkAppService extends Service implements Runnable {
return false;
}
}
-