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

Commit 47edf95b authored Sep 18, 2015 by Shishir Agrawal Committed by Android Git Automerger Sep 18, 2015

am 3649c699: am 773afa28: am 04feedd4: am 896f738c: Merge "Allow...

am 3649c699: am 773afa28: am 04feedd4: am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev

* commit '3649c699':
  Allow non-persistent manual network selection.

parents 9196534f 3649c699

telephony/java/android/telephony/TelephonyManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -3611,11 +3611,12 @@ public class TelephonyManager {
		*
		* @hide
		*/
		public boolean setNetworkSelectionModeManual(int subId, OperatorInfo operator) {
		public boolean setNetworkSelectionModeManual(int subId, OperatorInfo operator,
		boolean persistSelection) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.setNetworkSelectionModeManual(subId, operator);
		return telephony.setNetworkSelectionModeManual(subId, operator, persistSelection);
		} catch (RemoteException ex) {
		Rlog.e(TAG, "setNetworkSelectionModeManual RemoteException", ex);
		} catch (NullPointerException ex) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+5 −1

Original line number	Diff line number	Diff line
		@@ -707,9 +707,13 @@ interface ITelephony {
		*
		* @param subId the id of the subscription.
		* @param operatorInfo the operator to attach to.
		* @param persistSelection should the selection persist till reboot or its
		* turned off? Will also result in notification being not shown to
		* the user if the signal is lost.
		* @return true if the request suceeded.
		*/
		boolean setNetworkSelectionModeManual(int subId, in OperatorInfo operator);
		boolean setNetworkSelectionModeManual(int subId, in OperatorInfo operator,
		boolean persistSelection);

		/**
		* Set the preferred network type.