Merge "Add pollState when setting automatic network selection mode is done." into main (000c341f) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2297,6 +2297,11 @@ public class GsmCdmaPhone extends Phone {
		return (mManualNetworkSelectionPlmn == null) ? "" : mManualNetworkSelectionPlmn;
		}

		@Override
		protected void onSetNetworkSelectionModeCompleted() {
		mSST.pollState();
		}

		@Override
		public String getCdmaPrlVersion() {
		return mSST.getPrlVersion();

+7 −0

Original line number	Diff line number	Diff line
		@@ -779,6 +779,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		case EVENT_SET_NETWORK_MANUAL_COMPLETE:
		case EVENT_SET_NETWORK_AUTOMATIC_COMPLETE:
		handleSetSelectNetwork((AsyncResult) msg.obj);
		onSetNetworkSelectionModeCompleted();
		return;
		}

		@@ -1535,6 +1536,12 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		updateSavedNetworkOperator(nsm);
		}

		/**
		* Called when setting network selection mode is complete.
		*/
		protected void onSetNetworkSelectionModeCompleted() {
		}

		/**
		* Query the radio for the current network selection mode.
		*