resolve merge conflicts of 4c04097 to nyc-mr1-dev

Change-Id: I256514588af20985108f72a5e204811904f87c9c

diff --cc api/current.txt
index 35514f2,ebda35c..5c47f11
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -37343,34 -37201,14 +37343,34 @@@ package android.telephony 
      method public void onSubscriptionsChanged();
    }
  
 +  public final class TelephonyHistogram implements android.os.Parcelable {
 +    ctor public TelephonyHistogram(int, int, int);
 +    ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
 +    ctor public TelephonyHistogram(android.os.Parcel);
 +    method public void addTimeTaken(int);
 +    method public int describeContents();
 +    method public int getAverageTime();
 +    method public int getBucketCount();
 +    method public int[] getBucketCounters();
 +    method public int[] getBucketEndPoints();
 +    method public int getCategory();
 +    method public int getId();
 +    method public int getMaxTime();
 +    method public int getMinTime();
 +    method public int getSampleCount();
 +    method public void writeToParcel(android.os.Parcel, int);
 +    field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
 +    field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
 +  }
 +
    public class TelephonyManager {
      method public boolean canChangeDtmfToneLength();
+     method public android.telephony.TelephonyManager createForSubscriptionId(int);
      method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
      method public int getCallState();
-     method public int getCallState(int);
      method public android.telephony.CellLocation getCellLocation();
      method public int getDataActivity();
-     method public int getDataNetworkType(int);
+     method public int getDataNetworkType();
      method public int getDataState();
      method public java.lang.String getDeviceId();
      method public java.lang.String getDeviceId(int);
@@@ -37395,40 -37226,24 +37388,25 @@@
      method public int getPhoneCount();
      method public int getPhoneType();
      method public java.lang.String getSimCountryIso();
-     method public java.lang.String getSimCountryIso(int);
      method public java.lang.String getSimOperator();
-     method public java.lang.String getSimOperator(int);
      method public java.lang.String getSimOperatorName();
-     method public java.lang.String getSimOperatorName(int);
      method public java.lang.String getSimSerialNumber();
-     method public java.lang.String getSimSerialNumber(int);
      method public int getSimState();
      method public java.lang.String getSubscriberId();
-     method public java.lang.String getSubscriberId(int);
 +    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
      method public java.lang.String getVoiceMailAlphaTag();
-     method public java.lang.String getVoiceMailAlphaTag(int);
      method public java.lang.String getVoiceMailNumber();
-     method public java.lang.String getVoiceMailNumber(int);
-     method public int getVoiceNetworkType(int);
+     method public int getVoiceNetworkType();
      method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
      method public boolean hasCarrierPrivileges();
-     method public boolean hasCarrierPrivileges(int);
      method public boolean hasIccCard();
      method public boolean iccCloseLogicalChannel(int);
-     method public boolean iccCloseLogicalChannel(int, int);
      method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
-     method public byte[] iccExchangeSimIO(int, int, int, int, int, int, java.lang.String);
      method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
-     method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(int, java.lang.String);
      method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
-     method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, int, java.lang.String);
      method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
-     method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, int, java.lang.String);
      method public boolean isHearingAidCompatibilitySupported();
      method public boolean isNetworkRoaming();
-     method public boolean isNetworkRoaming(int);
      method public boolean isSmsCapable();
      method public boolean isTtyModeSupported();
      method public boolean isVoiceCapable();

diff --cc api/system-current.txt
index 1e4722d,0b6ac73..42211a7
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -40347,23 -40178,14 +40340,15 @@@ package android.telephony 
      method public int getPhoneCount();
      method public int getPhoneType();
      method public java.lang.String getSimCountryIso();
-     method public java.lang.String getSimCountryIso(int);
      method public java.lang.String getSimOperator();
-     method public java.lang.String getSimOperator(int);
      method public java.lang.String getSimOperatorName();
-     method public java.lang.String getSimOperatorName(int);
      method public java.lang.String getSimSerialNumber();
-     method public java.lang.String getSimSerialNumber(int);
      method public int getSimState();
      method public java.lang.String getSubscriberId();
-     method public java.lang.String getSubscriberId(int);
 +    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
      method public java.lang.String getVoiceMailAlphaTag();
-     method public java.lang.String getVoiceMailAlphaTag(int);
      method public java.lang.String getVoiceMailNumber();
-     method public java.lang.String getVoiceMailNumber(int);
-     method public int getVoiceNetworkType(int);
+     method public int getVoiceNetworkType();
      method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
      method public boolean handlePinMmi(java.lang.String);
      method public boolean handlePinMmiForSubscriber(int, java.lang.String);

diff --cc api/test-current.txt
index 6dc2e48,d277fd7..cfc6110
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -37421,34 -37278,14 +37421,34 @@@ package android.telephony 
      method public void onSubscriptionsChanged();
    }
  
 +  public final class TelephonyHistogram implements android.os.Parcelable {
 +    ctor public TelephonyHistogram(int, int, int);
 +    ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
 +    ctor public TelephonyHistogram(android.os.Parcel);
 +    method public void addTimeTaken(int);
 +    method public int describeContents();
 +    method public int getAverageTime();
 +    method public int getBucketCount();
 +    method public int[] getBucketCounters();
 +    method public int[] getBucketEndPoints();
 +    method public int getCategory();
 +    method public int getId();
 +    method public int getMaxTime();
 +    method public int getMinTime();
 +    method public int getSampleCount();
 +    method public void writeToParcel(android.os.Parcel, int);
 +    field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
 +    field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
 +  }
 +
    public class TelephonyManager {
      method public boolean canChangeDtmfToneLength();
+     method public android.telephony.TelephonyManager createForSubscriptionId(int);
      method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
      method public int getCallState();
-     method public int getCallState(int);
      method public android.telephony.CellLocation getCellLocation();
      method public int getDataActivity();
-     method public int getDataNetworkType(int);
+     method public int getDataNetworkType();
      method public int getDataState();
      method public java.lang.String getDeviceId();
      method public java.lang.String getDeviceId(int);
@@@ -37473,40 -37303,24 +37466,25 @@@
      method public int getPhoneCount();
      method public int getPhoneType();
      method public java.lang.String getSimCountryIso();
-     method public java.lang.String getSimCountryIso(int);
      method public java.lang.String getSimOperator();
-     method public java.lang.String getSimOperator(int);
      method public java.lang.String getSimOperatorName();
-     method public java.lang.String getSimOperatorName(int);
      method public java.lang.String getSimSerialNumber();
-     method public java.lang.String getSimSerialNumber(int);
      method public int getSimState();
      method public java.lang.String getSubscriberId();
-     method public java.lang.String getSubscriberId(int);
 +    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
      method public java.lang.String getVoiceMailAlphaTag();
-     method public java.lang.String getVoiceMailAlphaTag(int);
      method public java.lang.String getVoiceMailNumber();
-     method public java.lang.String getVoiceMailNumber(int);
-     method public int getVoiceNetworkType(int);
+     method public int getVoiceNetworkType();
      method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
      method public boolean hasCarrierPrivileges();
-     method public boolean hasCarrierPrivileges(int);
      method public boolean hasIccCard();
      method public boolean iccCloseLogicalChannel(int);
-     method public boolean iccCloseLogicalChannel(int, int);
      method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
-     method public byte[] iccExchangeSimIO(int, int, int, int, int, int, java.lang.String);
      method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
-     method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(int, java.lang.String);
      method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
-     method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, int, java.lang.String);
      method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
-     method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, int, java.lang.String);
      method public boolean isHearingAidCompatibilitySupported();
      method public boolean isNetworkRoaming();
-     method public boolean isNetworkRoaming(int);
      method public boolean isSmsCapable();
      method public boolean isTtyModeSupported();
      method public boolean isVoiceCapable();

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