From: Ying Xu <yinxu@google.com>
Date: Fri, 22 Dec 2017 01:26:53 +0000 (+0000)
Subject: Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
X-Git-Tag: android-x86-9.0-r1~284^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f51741ae2fc4bf8887e41e3129c55d6fe0d94b6;p=android-x86%2Fframeworks-base.git

Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64
---

5f51741ae2fc4bf8887e41e3129c55d6fe0d94b6
diff --cc api/current.txt
index bf9b550a259e,e8d0ee279ba9..47a338b2363b
--- a/api/current.txt
+++ b/api/current.txt
@@@ -41125,11 -40740,12 +41269,13 @@@ package android.telephony 
      method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
      method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);
      method public void sendVisualVoicemailSms(java.lang.String, int, java.lang.String, android.app.PendingIntent);
 -    method public void setDataEnabled(boolean);
 +    method public deprecated void setDataEnabled(boolean);
      method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
+     method public void setNetworkSelectionModeAutomatic();
+     method public boolean setNetworkSelectionModeManual(java.lang.String, boolean);
      method public boolean setOperatorBrandOverride(java.lang.String);
      method public boolean setPreferredNetworkTypeToGlobal();
 +    method public void setUserMobileDataEnabled(boolean);
      method public void setVisualVoicemailSmsFilterSettings(android.telephony.VisualVoicemailSmsFilterSettings);
      method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
      method public deprecated void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);