Merge "Add extra data to auto network selection message." (056efe7d) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		// Key used to read/write "disable DNS server check" pref (used for testing)
		private static final String DNS_SERVER_CHECK_DISABLED_KEY = "dns_server_check_disabled_key";

		// Integer used to let the calling application know that the we are ignoring auto mode switch.
		private static final int ALREADY_IN_AUTO_SELECTION = 1;

		/**
		* This method is invoked when the Phone exits Emergency Callback Mode.
		*/
		@@ -1205,6 +1208,11 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCi.setNetworkSelectionModeAutomatic(msg);
		} else {
		Rlog.d(LOG_TAG, "setNetworkSelectionModeAutomatic - already auto, ignoring");
		// let the calling application know that the we are ignoring automatic mode switch.
		if (nsm.message != null) {
		nsm.message.arg1 = ALREADY_IN_AUTO_SELECTION;
		}

		ar.userObj = nsm;
		handleSetSelectNetwork(ar);
		}