Merge "Unhide isRttSupported in TelephonyManager" am: 3d834a0e69 am: 9f588cdd1c

am: 73a732630e

Change-Id: I2f3d50be4c109cae5a85fcfae49ad6d279a55733

diff --cc api/current.txt
index 9dec22e,1e9f200..2e2a398
mode 100644,100755..100644
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt

diff --cc api/test-current.txt
index a1d9c77,34c8f6e..ca1f0cc
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -2121,15 -1476,9 +2121,14 @@@ package android.telephony 
    }
  
    public class TelephonyManager {
 +    method public int checkCarrierPrivilegesForPackage(String);
      method public int getCarrierIdListVersion();
-     method public boolean isRttSupported();
      method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
      method public void setCarrierTestOverride(String, String, String, String, String, String, String);
 +    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
 +    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
 +    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0
 +    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff
      field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff
    }
  

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