Guest User

Untitled

a guest
May 16th, 2015
349
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.82 KB | None | 0 0
  1. vasy@cm-build:~/android_frameworks_base/telephony/java/com/android/internal/telephony$ git diff cm-10.2.1 RILConstants.java
  2. diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
  3. index cd453aa..4c85583 100644
  4. --- a/telephony/java/com/android/internal/telephony/RILConstants.java
  5. +++ b/telephony/java/com/android/internal/telephony/RILConstants.java
  6. @@ -1,8 +1,8 @@
  7. /*
  8. * Copyright (C) 2006 The Android Open Source Project
  9. - * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
  10. + * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  11. *
  12. - *Not a Contribution.
  13. + * Not a Contribution.
  14. *
  15. * Licensed under the Apache License, Version 2.0 (the "License");
  16. * you may not use this file except in compliance with the License.
  17. @@ -58,9 +58,10 @@ public interface RILConstants {
  18. int ILLEGAL_SIM_OR_ME = 15; /* network selection failure due
  19. to wrong SIM/ME and no
  20. retries needed */
  21. +
  22. int DIAL_MODIFIED_TO_USSD = 17; /* DIAL request modified to USSD */
  23. int DIAL_MODIFIED_TO_SS = 18; /* DIAL request modified to SS */
  24. - int DIAL_MODIFIED_TO_DIAL = 19; /* DIAL request modified to DIAL with different data */
  25. + int DIAL_MODIFIED_TO_DIAL = 19; /* DIAL request modified to DIAL with different data*/
  26. int USSD_MODIFIED_TO_DIAL = 20; /* USSD request modified to DIAL */
  27. int USSD_MODIFIED_TO_SS = 21; /* USSD request modified to SS */
  28. int USSD_MODIFIED_TO_USSD = 22; /* USSD request modified to different USSD request */
  29. @@ -68,6 +69,9 @@ public interface RILConstants {
  30. int SS_MODIFIED_TO_USSD = 24; /* SS request modified to USSD */
  31. int SS_MODIFIED_TO_SS = 25; /* SS request modified to different SS request */
  32. int SUBSCRIPTION_NOT_SUPPORTED = 26; /* Subscription not supported */
  33. + int MISSING_RESOURCE = 27; /* no logical channel available */
  34. + int NO_SUCH_ELEMENT = 28; /* application not found on SIM */
  35. + int INVALID_PARAMETER = 29;
  36.  
  37. /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */
  38. int NETWORK_MODE_WCDMA_PREF = 0; /* GSM/WCDMA (WCDMA preferred) */
  39. @@ -83,7 +87,7 @@ public interface RILConstants {
  40. AVAILABLE Application Settings menu*/
  41. int NETWORK_MODE_LTE_CDMA_EVDO = 8; /* LTE, CDMA and EvDo */
  42. int NETWORK_MODE_LTE_GSM_WCDMA = 9; /* LTE, GSM/WCDMA */
  43. - int NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
  44. + int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
  45. int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */
  46. int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */
  47. int NETWORK_MODE_TD_SCDMA_ONLY = 13; /* TD-SCDMA only */
  48. @@ -106,7 +110,8 @@ public interface RILConstants {
  49. int GSM_PHONE = 1;
  50. int CDMA_PHONE = 2;
  51. int SIP_PHONE = 3;
  52. - int IMS_PHONE = 4;
  53. + int THIRD_PARTY_PHONE = 4;
  54. + int IMS_PHONE = 5;
  55.  
  56. int LTE_ON_CDMA_UNKNOWN = -1;
  57. int LTE_ON_CDMA_FALSE = 0;
  58. @@ -137,6 +142,11 @@ public interface RILConstants {
  59. int DEACTIVATE_REASON_RADIO_OFF = 1;
  60. int DEACTIVATE_REASON_PDP_RESET = 2;
  61.  
  62. + /* NV config radio reset types. */
  63. + int NV_CONFIG_RELOAD_RESET = 1;
  64. + int NV_CONFIG_ERASE_RESET = 2;
  65. + int NV_CONFIG_FACTORY_RESET = 3;
  66. +
  67. /*
  68. cat include/telephony/ril.h | \
  69. egrep '^#define' | \
  70. @@ -177,12 +187,6 @@ cat include/telephony/ril.h | \
  71. public static final int DATA_PROFILE_CBS = 4;
  72. public static final int DATA_PROFILE_OEM_BASE = 1000;
  73.  
  74. - /**
  75. - * Tethered mode on/off indication for RIL_UNSOL_TETHERED_MODE_STATE_CHANGED
  76. - */
  77. - int RIL_TETHERED_MODE_ON = 1;
  78. - int RIL_TETHERED_MODE_OFF = 0;
  79. -
  80. int RIL_REQUEST_GET_SIM_STATUS = 1;
  81. int RIL_REQUEST_ENTER_SIM_PIN = 2;
  82. int RIL_REQUEST_ENTER_SIM_PUK = 3;
  83. @@ -293,13 +297,28 @@ cat include/telephony/ril.h | \
  84. int RIL_REQUEST_VOICE_RADIO_TECH = 108;
  85. int RIL_REQUEST_GET_CELL_INFO_LIST = 109;
  86. int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110;
  87. - int RIL_REQUEST_IMS_REGISTRATION_STATE = 111;
  88. - int RIL_REQUEST_IMS_SEND_SMS = 112;
  89. - int RIL_REQUEST_GET_DATA_CALL_PROFILE = 113;
  90. - int RIL_REQUEST_SET_UICC_SUBSCRIPTION = 114;
  91. - int RIL_REQUEST_SET_DATA_SUBSCRIPTION = 115;
  92. - int RIL_REQUEST_GET_UICC_SUBSCRIPTION = 116;
  93. - int RIL_REQUEST_GET_DATA_SUBSCRIPTION = 117;
  94. + int RIL_REQUEST_SET_INITIAL_ATTACH_APN = 111;
  95. + int RIL_REQUEST_IMS_REGISTRATION_STATE = 112;
  96. + int RIL_REQUEST_IMS_SEND_SMS = 113;
  97. + int RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC = 114;
  98. + int RIL_REQUEST_SIM_OPEN_CHANNEL = 115;
  99. + int RIL_REQUEST_SIM_CLOSE_CHANNEL = 116;
  100. + int RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL = 117;
  101. + int RIL_REQUEST_NV_READ_ITEM = 118;
  102. + int RIL_REQUEST_NV_WRITE_ITEM = 119;
  103. + int RIL_REQUEST_NV_WRITE_CDMA_PRL = 120;
  104. + int RIL_REQUEST_NV_RESET_CONFIG = 121;
  105. + int RIL_REQUEST_SET_UICC_SUBSCRIPTION = 122;
  106. + int RIL_REQUEST_ALLOW_DATA = 123;
  107. + int RIL_REQUEST_GET_HARDWARE_CONFIG = 124;
  108. + int RIL_REQUEST_SIM_AUTHENTICATION = 125;
  109. + int RIL_REQUEST_GET_DC_RT_INFO = 126;
  110. + int RIL_REQUEST_SET_DC_RT_INFO_RATE = 127;
  111. + int RIL_REQUEST_SET_DATA_PROFILE = 128;
  112. + int RIL_REQUEST_SHUTDOWN = 129;
  113. + int RIL_REQUEST_GET_DATA_CALL_PROFILE = 130;
  114. + int RIL_REQUEST_SIM_GET_ATR = 131;
  115. +
  116. int RIL_UNSOL_RESPONSE_BASE = 1000;
  117. int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
  118. int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;
  119. @@ -333,16 +352,16 @@ cat include/telephony/ril.h | \
  120. int RIL_UNSOL_RINGBACK_TONE = 1029;
  121. int RIL_UNSOL_RESEND_INCALL_MUTE = 1030;
  122. int RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED = 1031;
  123. - int RIL_UNSOL_CDMA_PRL_CHANGED = 1032;
  124. + int RIL_UNSOl_CDMA_PRL_CHANGED = 1032;
  125. int RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE = 1033;
  126. int RIL_UNSOL_RIL_CONNECTED = 1034;
  127. int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;
  128. int RIL_UNSOL_CELL_INFO_LIST = 1036;
  129. int RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037;
  130. - int RIL_UNSOL_TETHERED_MODE_STATE_CHANGED = 1038;
  131. - int RIL_UNSOL_ON_SS = 1039;
  132. - int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1040;
  133. - int RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED = 1041;
  134. -
  135. + int RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED = 1038;
  136. + int RIL_UNSOL_SRVCC_STATE_NOTIFY = 1039;
  137. + int RIL_UNSOL_HARDWARE_CONFIG_CHANGED = 1040;
  138. + int RIL_UNSOL_ON_SS = 1042;
  139. + int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1043;
  140. int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */
  141. }
Advertisement
Add Comment
Please, Sign In to add comment