resolved conflicts for merge 322f7d6e to master-nova

Change-Id: I31de6084253ce21f50224582f82b7f7e630ef34e

1 files changed, 17 insertions, 0 deletions

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index adc923b..4c0f259 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -441,4 +441,21 @@ interface ITelephony {
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     void setWhenToMakeWifiCalls(int state);
+
+    /*
+     * Get the preferred network type.
+     * Used for device configuration by some CDMA operators.
+     *
+     * @return the preferred network type, defined in RILConstants.java.
+     */
+    int getPreferredNetworkType();
+
+    /**
+     * Set the preferred network type.
+     * Used for device configuration by some CDMA operators.
+     *
+     * @param networkType the preferred network type, defined in RILConstants.java.
+     * @return true on success; false on any failure.
+     */
+    boolean setPreferredNetworkType(int networkType);
 }