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

am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64

diff --cc api/current.txt
index bf9b550,e8d0ee2..47a338b
--- 1/api/current.txt
--- 2/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);

diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge