Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." (5b37dd66) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ public class CarrierActionAgent extends Handler {
		sendMessage(obtainMessage(CARRIER_ACTION_REPORT_DEFAULT_NETWORK_STATUS, report));
		}

		private void carrierActionReset() {
		public void carrierActionReset() {
		carrierActionReportDefaultNetworkStatus(false);
		carrierActionSetMeteredApnsEnabled(true);
		carrierActionSetRadioEnabled(true);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -735,10 +735,12 @@ public class DeviceStateMonitor extends Handler {
		* These thresholds are taken from the LTE RSRP defaults in {@link CarrierConfigManager}.
		*/
		public static final int[] EUTRAN = new int[] {
		-140, /* SIGNAL_STRENGTH_NONE_OR_UNKNOWN */
		-128, /* SIGNAL_STRENGTH_POOR */
		-118, /* SIGNAL_STRENGTH_MODERATE */
		-108, /* SIGNAL_STRENGTH_GOOD */
		-98, /* SIGNAL_STRENGTH_GREAT */
		-44 /* SIGNAL_STRENGTH_NONE_OR_UNKNOWN */
		};

		/**

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3044,8 +3044,8 @@ public class GsmCdmaPhone extends Phone {
		* selection is disallowed. So we should force auto select mode.
		*/
		if (isManualSelProhibitedInGlobalMode()
		&& ((nwMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)
		\|\| (nwMode == TelephonyManager.NETWORK_MODE_GLOBAL)) ){
		&& ((nwMode == Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA)
		\|\| (nwMode == Phone.NT_MODE_GLOBAL)) ){
		logd("Should force auto network select mode = " + nwMode);
		return true;
		} else {

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -3114,6 +3114,13 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCarrierActionAgent.carrierActionReportDefaultNetworkStatus(report);
		}

		/**
		* Action set from carrier signalling broadcast receivers to reset all carrier actions
		*/
		public void carrierActionResetAll() {
		mCarrierActionAgent.carrierActionReset();
		}

		/**
		* Notify registrants of a new ringing Connection.
		* Subclasses of Phone probably want to replace this with a

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

+30 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,36 @@ public interface PhoneInternalInterface {
		static final int BM_US_2500M = RILConstants.BAND_MODE_USA_2500M;
		static final int BM_NUM_BAND_MODES = 19; //Total number of band modes

		// Used for preferred network type
		// Note NT_* substitute RILConstants.NETWORK_MODE_* above the Phone
		int NT_MODE_WCDMA_PREF = RILConstants.NETWORK_MODE_WCDMA_PREF;
		int NT_MODE_GSM_ONLY = RILConstants.NETWORK_MODE_GSM_ONLY;
		int NT_MODE_WCDMA_ONLY = RILConstants.NETWORK_MODE_WCDMA_ONLY;
		int NT_MODE_GSM_UMTS = RILConstants.NETWORK_MODE_GSM_UMTS;

		int NT_MODE_CDMA = RILConstants.NETWORK_MODE_CDMA;

		int NT_MODE_CDMA_NO_EVDO = RILConstants.NETWORK_MODE_CDMA_NO_EVDO;
		int NT_MODE_EVDO_NO_CDMA = RILConstants.NETWORK_MODE_EVDO_NO_CDMA;
		int NT_MODE_GLOBAL = RILConstants.NETWORK_MODE_GLOBAL;

		int NT_MODE_LTE_CDMA_AND_EVDO = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;
		int NT_MODE_LTE_GSM_WCDMA = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;
		int NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
		int NT_MODE_LTE_ONLY = RILConstants.NETWORK_MODE_LTE_ONLY;
		int NT_MODE_LTE_WCDMA = RILConstants.NETWORK_MODE_LTE_WCDMA;

		int NT_MODE_TDSCDMA_ONLY = RILConstants.NETWORK_MODE_TDSCDMA_ONLY;
		int NT_MODE_TDSCDMA_WCDMA = RILConstants.NETWORK_MODE_TDSCDMA_WCDMA;
		int NT_MODE_LTE_TDSCDMA = RILConstants.NETWORK_MODE_LTE_TDSCDMA;
		int NT_MODE_TDSCDMA_GSM = RILConstants.NETWORK_MODE_TDSCDMA_GSM;
		int NT_MODE_LTE_TDSCDMA_GSM = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
		int NT_MODE_TDSCDMA_GSM_WCDMA = RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;
		int NT_MODE_LTE_TDSCDMA_WCDMA = RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
		int NT_MODE_LTE_TDSCDMA_GSM_WCDMA = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
		int NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
		int NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;

		@UnsupportedAppUsage
		int PREFERRED_NT_MODE = RILConstants.PREFERRED_NETWORK_MODE;