Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00700019 authored Dec 05, 2012 by Ricardo Cerqueira Committed by Gerrit Code Review Dec 05, 2012

Merge "Telephony: Add getLteOnGsmMode() method (2/2)" into mr1-staging

parents ca3962ce 9ed31967

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -644,4 +644,12 @@ public abstract class BaseCommands implements CommandsInterface {

		@Override
		public void testingEmergencyCall() {}

		/**
		* @hide
		*/
		@Override
		public int getLteOnGsmMode() {
		return TelephonyManager.getLteOnGsmModeStatic();
		}
		}

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1562,6 +1562,12 @@ public interface CommandsInterface {
		*/
		public int getLteOnCdmaMode();

		/**
		* Return if the current radio is LTE on GSM
		* @hide
		*/
		public int getLteOnGsmMode();

		/**
		* Request the ISIM application on the UICC to perform the AKA
		* challenge/response algorithm for IMS authentication. The nonce string

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1649,6 +1649,12 @@ public interface Phone {
		*/
		public int getLteOnCdmaMode();

		/**
		* Return if the current radio is LTE on GSM
		* @hide
		*/
		public int getLteOnGsmMode();

		/**
		* TODO: Adding a function for each property is not good.
		* A fucntion of type getPhoneProp(propType) where propType is an

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1191,6 +1191,14 @@ public abstract class PhoneBase extends Handler implements Phone {
		return mCM.getLteOnCdmaMode();
		}

		/**
		* {@hide}
		*/
		@Override
		public int getLteOnGsmMode() {
		return mCM.getLteOnGsmMode();
		}

		/**
		* Sets the SIM voice message waiting indicator records.
		* @param line GSM Subscriber Profile Number, one-based. Only '1' is supported

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,9 @@ public class PhoneFactory {
		if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {
		preferredNetworkMode = Phone.NT_MODE_GLOBAL;
		}
		if (TelephonyManager.getLteOnGsmModeStatic() != 0) {
		preferredNetworkMode = Phone.NT_MODE_LTE_GSM_WCDMA;
		}
		int networkMode = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode);
		Log.i(LOG_TAG, "Network Mode set to " + Integer.toString(networkMode));