Merge "move short code definitions to SmsManager Test API"

diff --cc api/test-current.txt
index 6c0b928,42c0900..56c5e98
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -2657,12 -2541,19 +2657,21 @@@ package android.telephony 
      method public void setCdmaSystemAndNetworkId(int, int);
      method public void setCellBandwidths(int[]);
      method public void setChannelNumber(int);
 +    method public void setDataRoamingType(int);
      method public void setRilDataRadioTechnology(int);
      method public void setRilVoiceRadioTechnology(int);
 +    method public void setVoiceRoamingType(int);
    }
  
+   public final class SmsManager {
+     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int checkSmsShortCodeDestination(String, String);
+     field public static final int SMS_CATEGORY_FREE_SHORT_CODE = 1; // 0x1
+     field public static final int SMS_CATEGORY_NOT_SHORT_CODE = 0; // 0x0
+     field public static final int SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE = 3; // 0x3
+     field public static final int SMS_CATEGORY_PREMIUM_SHORT_CODE = 4; // 0x4
+     field public static final int SMS_CATEGORY_STANDARD_SHORT_CODE = 2; // 0x2
+   }
+ 
    public class TelephonyManager {
      method public int checkCarrierPrivilegesForPackage(String);
      method public int getCarrierIdListVersion();