diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:25:49 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:25:49 +0000 |
commit | 129b42af2b04a39da53df8da5031526c9a432cc8 (patch) | |
tree | 017c0649b10037a1541f48c9c3a47fbaf1647be5 | |
parent | 5295d565a5dad01db8d085944f7d74f2acc4bc8e (diff) | |
parent | 9cdc5a79b32c4158499d640a254891ac2b1d3250 (diff) | |
download | ims-oreo-m6-s2-release.tar.gz |
release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: Icc0960019b053d8a8bf8e45da7b89fa0a988a02f
-rw-r--r-- | rcs/rcsservice/src/com/android/service/ims/RcsService.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java index 53ba728..aeccb30 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java @@ -61,6 +61,8 @@ import com.android.ims.internal.IRcsPresence; import com.android.ims.RcsPresence.PublishState; import com.android.ims.internal.Logger; +import com.android.internal.telephony.IccCardConstants; +import com.android.internal.telephony.TelephonyIntents; import com.android.service.ims.RcsStackAdaptor; import com.android.service.ims.presence.PresencePublication; @@ -115,8 +117,6 @@ public class RcsService extends Service{ Settings.Global.getUriFor(Settings.Global.VT_IMS_ENABLED), false, mVtSettingObserver); - registerImsConnectionStateListener(); - mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -127,6 +127,11 @@ public class RcsService extends Service{ } else if(ImsManager.ACTION_IMS_SERVICE_DOWN.equalsIgnoreCase( intent.getAction())){ handleImsServiceDown(); + } else if(TelephonyIntents.ACTION_SIM_STATE_CHANGED.equalsIgnoreCase( + intent.getAction())) { + String stateExtra = intent.getStringExtra( + IccCardConstants.INTENT_KEY_ICC_STATE); + handleSimStateChanged(stateExtra); } } }; @@ -134,6 +139,7 @@ public class RcsService extends Service{ IntentFilter statusFilter = new IntentFilter(); statusFilter.addAction(ImsManager.ACTION_IMS_SERVICE_UP); statusFilter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN); + statusFilter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); registerReceiver(mReceiver, statusFilter); } @@ -151,6 +157,14 @@ public class RcsService extends Service{ } } + public void handleSimStateChanged(String state) { + + if(IccCardConstants.INTENT_VALUE_ICC_LOADED.equalsIgnoreCase(state)) { + // ImsManager depends on a loaded SIM to get the default Voice Registration. + registerImsConnectionStateListener(); + } + } + @Override public int onStartCommand(Intent intent, int flags, int startId) { @@ -358,8 +372,7 @@ public class RcsService extends Service{ ImsManager imsManager = ImsManager.getInstance(this, SubscriptionManager.getDefaultVoicePhoneId()); if (imsManager != null) { - imsManager.addRegistrationListener(ImsServiceClass.MMTEL, - mImsConnectionStateListener); + imsManager.addRegistrationListener(mImsConnectionStateListener); } } catch (ImsException e) { logger.error("addRegistrationListener exception=", e); |