Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow non-persistent manual network selection." into mnc-dr-dev

Browse Source
This commit is contained in:
Shishir Agrawal
2015-09-18 01:49:58 +00:00
committed by Android (Google) Code Review
parent 58e378b025 e25bd01ad6
commit 896f738cdd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/TelephonyManager.java
View File

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

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -707,9 +707,13 @@ interface ITelephony {
* *
* @param subId the id of the subscription. * @param subId the id of the subscription.
* @param operatorInfo the operator to attach to. * @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. * @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. * Set the preferred network type.