Merge "Skip notifying network locked registrants if UiccApp==null" am: 290f69100c (73bdda79) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/UiccProfile.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -197,8 +197,13 @@ public class UiccProfile extends IccCard {
		logWithLocalLog("handleMessage: Received " + eventName + " for phoneId " + mPhoneId);
		switch (msg.what) {
		case EVENT_NETWORK_LOCKED:
		if (mUiccApplication != null) {
		mNetworkLockedRegistrants.notifyRegistrants(new AsyncResult(
		null, mUiccApplication.getPersoSubState().ordinal(), null));
		} else {
		log("EVENT_NETWORK_LOCKED: mUiccApplication is NULL, "
		+ "mNetworkLockedRegistrants not notified.");
		}
		// intentional fall through
		case EVENT_RADIO_OFF_OR_UNAVAILABLE:
		case EVENT_ICC_LOCKED:
		@@ -771,8 +776,15 @@ public class UiccProfile extends IccCard {
		mNetworkLockedRegistrants.add(r);

		if (getState() == IccCardConstants.State.NETWORK_LOCKED) {
		if (mUiccApplication != null) {
		r.notifyRegistrant(
		new AsyncResult(null, mUiccApplication.getPersoSubState().ordinal(), null));
		new AsyncResult(null, mUiccApplication.getPersoSubState().ordinal(),
		null));

		} else {
		log("registerForNetworkLocked: not notifying registrants, "
		+ "mUiccApplication == null");
		}
		}
		}
		}