diff options
author | Shishir Agrawal <shishir@google.com> | 2015-09-18 02:02:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-18 02:02:11 +0000 |
commit | 04feedd439989363b629a7d596637d55cf92bbc9 (patch) | |
tree | d1a238327e01dca520a954a6274c01c74848429a /telephony/java/android/telephony | |
parent | 5c2bfa8ff08331a2a62a1dd7496331eb977c0f13 (diff) | |
parent | 896f738cdddec8cfda82b177e3a60c5a85004229 (diff) | |
download | frameworks_base-04feedd439989363b629a7d596637d55cf92bbc9.zip frameworks_base-04feedd439989363b629a7d596637d55cf92bbc9.tar.gz frameworks_base-04feedd439989363b629a7d596637d55cf92bbc9.tar.bz2 |
am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev
* commit '896f738cdddec8cfda82b177e3a60c5a85004229':
Allow non-persistent manual network selection.
Diffstat (limited to 'telephony/java/android/telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f6e4bed..d22727d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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) { |