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

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

Browse Source 
* commit '773afa28ef587537ac6823cb366a87eeca311af4':
  Allow non-persistent manual network selection.
This commit is contained in:
Shishir Agrawal
2015-09-18 02:17:26 +00:00
committed by Android Git Automerger
parent 2c049cfc61 773afa28ef
commit 3649c699ad
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

@@ -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) {

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 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.