Merge "Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-mr1-dev (51f7ab2d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -196,7 +196,6 @@ public class SubscriptionInfoUpdater extends Handler {
		ActivityManagerNative.broadcastStickyIntent(i, READ_PHONE_STATE,
		UserHandle.USER_ALL);
		}
		rebroadcastIntentsOnUnlock = null;
		logd("[Receiver]-");
		return;
		}
		@@ -217,6 +216,7 @@ public class SubscriptionInfoUpdater extends Handler {
		logd("simStatus: " + simStatus);

		if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
		rebroadcastIntentsOnUnlock.put(slotId, intent);
		if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(simStatus)) {
		sendMessage(obtainMessage(EVENT_SIM_ABSENT, slotId, -1));
		} else if (IccCardConstants.INTENT_VALUE_ICC_UNKNOWN.equals(simStatus)) {
		@@ -689,10 +689,8 @@ public class SubscriptionInfoUpdater extends Handler {
		logd("Broadcasting intent ACTION_SIM_STATE_CHANGED " + state + " reason " + reason +
		" for mCardIndex: " + slotId);
		ActivityManagerNative.broadcastStickyIntent(i, READ_PHONE_STATE, UserHandle.USER_ALL);
		if (!mUserManager.isUserUnlocked()) {
		rebroadcastIntentsOnUnlock.put(slotId, i);
		}
		}

		public void dispose() {
		logd("[dispose]");