API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 15th, 2015
163
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.30 KB | None | 0 0
raw download clone embed print report
  1. From b2483a35e0fae6faacb4492d1617cb85000063ef Mon Sep 17 00:00:00 2001
  2. From: Chaitanya Saggurthi <csaggurt@codeaurora.org>
  3. Date: Thu, 5 Feb 2015 18:37:59 +0530
  4. Subject: [PATCH 1/4] Add dummy SUB record in CDMA NV mode
  5.  
  6. Add dummy SUB info record when NV is ready in CDMA NV mode.
  7.  
  8. CRs-Fixed: 789989
  9.  
  10. Change-Id: Ie658087efaa9f93a329773d2d8f0601d083f3701
  11. ---
  12. src/java/com/android/internal/telephony/PhoneFactory.java | 4 ++++
  13. .../android/internal/telephony/SubscriptionInfoUpdater.java | 10 ++++++++++
  14. src/java/com/android/internal/telephony/cdma/CDMAPhone.java | 6 ++++++
  15. 3 files changed, 20 insertions(+)
  16.  
  17. diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java
  18. index 534c40a..7515980 100644
  19. --- a/src/java/com/android/internal/telephony/PhoneFactory.java
  20. +++ b/src/java/com/android/internal/telephony/PhoneFactory.java
  21. @@ -587,4 +587,8 @@ public class PhoneFactory {
  22. ipw.flush();
  23. }
  24. }
  25. +
  26. + public static SubscriptionInfoUpdater getSubscriptionInfoUpdater() {
  27. + return sSubInfoRecordUpdater;
  28. + }
  29. }
  30. diff --git a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
  31. index 58e982e..b862ea0 100644
  32. --- a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
  33. +++ b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
  34. @@ -71,6 +71,7 @@ public class SubscriptionInfoUpdater extends Handler {
  35. private static final int EVENT_SIM_UNKNOWN = 7;
  36.  
  37. private static final String ICCID_STRING_FOR_NO_SIM = "";
  38. + private static final String ICCID_STRING_FOR_NV = "DUMMY_NV_ID";
  39. /**
  40. * int[] sInsertSimState maintains all slots' SIM inserted status currently,
  41. * it may contain 4 kinds of values:
  42. @@ -495,6 +496,15 @@ public class SubscriptionInfoUpdater extends Handler {
  43. updateCarrierServices(slotId, IccCardConstants.INTENT_VALUE_ICC_ABSENT);
  44. }
  45.  
  46. + public void updateSubIdForNV(int slotId) {
  47. + mIccId[slotId] = ICCID_STRING_FOR_NV;
  48. + logd("[updateSubIdForNV]+ Start");
  49. + if (isAllIccIdQueryDone()) {
  50. + logd("[updateSubIdForNV]+ updating");
  51. + updateSubscriptionInfoByIccId();
  52. + }
  53. + }
  54. +
  55. /**
  56. * TODO: Simplify more, as no one is interested in what happened
  57. * only what the current list contains.
  58. diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
  59. index fd57b38..0c11529 100644
  60. --- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
  61. +++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
  62. @@ -61,11 +61,13 @@ import com.android.internal.telephony.MmiCode;
  63. import com.android.internal.telephony.OperatorInfo;
  64. import com.android.internal.telephony.PhoneBase;
  65. import com.android.internal.telephony.PhoneConstants;
  66. +import com.android.internal.telephony.PhoneFactory;
  67. import com.android.internal.telephony.PhoneNotifier;
  68. import com.android.internal.telephony.PhoneProxy;
  69. import com.android.internal.telephony.PhoneSubInfo;
  70. import com.android.internal.telephony.ServiceStateTracker;
  71. import com.android.internal.telephony.SubscriptionController;
  72. +import com.android.internal.telephony.SubscriptionInfoUpdater;
  73. import com.android.internal.telephony.TelephonyIntents;
  74. import com.android.internal.telephony.TelephonyProperties;
  75. import com.android.internal.telephony.UUSInfo;
  76. @@ -1376,6 +1378,10 @@ public class CDMAPhone extends PhoneBase {
  77. log("notifyMessageWaitingChanged");
  78. mNotifier.notifyMessageWaitingChanged(this);
  79. updateVoiceMail();
  80. + SubscriptionInfoUpdater subscriptionInfoUpdater = PhoneFactory.getSubscriptionInfoUpdater();
  81. + if (subscriptionInfoUpdater != null) {
  82. + subscriptionInfoUpdater.updateSubIdForNV(mPhoneId);
  83. + }
  84. }
  85. break;
  86.  
  87. --
  88. 2.6.4
  89.  
  90.  
  91. From 89134aac322a8981fd9cd44d78a7a508afc6350b Mon Sep 17 00:00:00 2001
  92. From: Gabriele M <moto.falcon.git@gmail.com>
  93. Date: Tue, 8 Dec 2015 22:34:36 +0100
  94. Subject: [PATCH 2/4] DcTracker: Fix CDMA data connection
  95.  
  96. This fixes e5dd24f39b18 ("Fix cdma data calls based on NV."), which
  97. was incorrectly applied when picked from an older branch.
  98.  
  99. Change-Id: Ia2ce26e31484cfbbc291da7fd43b5122e7003fdb
  100. ---
  101. src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 4 +---
  102. 1 file changed, 1 insertion(+), 3 deletions(-)
  103.  
  104. diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  105. index ae1daa6..949319c 100644
  106. --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  107. +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  108. @@ -789,9 +789,8 @@ public class DcTracker extends DcTrackerBase {
  109. boolean allowed =
  110. (attachedState || (mAutoAttachOnCreation.get() &&
  111. (mPhone.getSubId() == dataSub))) &&
  112. - recordsLoaded &&
  113. - (state == PhoneConstants.State.IDLE ||
  114. (subscriptionFromNv || recordsLoaded) &&
  115. + (state == PhoneConstants.State.IDLE ||
  116. mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) &&
  117. internalDataEnabled &&
  118. defaultDataSelected &&
  119. @@ -802,7 +801,6 @@ public class DcTracker extends DcTrackerBase {
  120. if (!(attachedState || mAutoAttachOnCreation.get())) {
  121. reason += " - Attached= " + attachedState;
  122. }
  123. - if (!recordsLoaded) reason += " - SIM not loaded";
  124. if (!(subscriptionFromNv || recordsLoaded)) {
  125. reason += " - SIM not loaded and not NV subscription";
  126. }
  127. --
  128. 2.6.4
  129.  
  130.  
  131. From 2e4148c25faa8e3429ad502ead73354956dc014b Mon Sep 17 00:00:00 2001
  132. From: Shareef Ali <shareefalis@cyanogenmod.org>
  133. Date: Fri, 28 Nov 2014 22:22:30 -0600
  134. Subject: [PATCH 3/4] DCTracker: HACK Fix eHRPD/LTE data connection.
  135.  
  136. * UICC controller is suppose to send a event that says uicc updated
  137. We are experiencing a race condition when UICC is init before the
  138. radio start which cause the sim is not ready response from radio.
  139. * This forces data when we have cdma voice connection.
  140.  
  141. Change-Id: Ifccafa148a703a2f9e137733d8450a3a961dca2a
  142. ---
  143. src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 2 +-
  144. 1 file changed, 1 insertion(+), 1 deletion(-)
  145.  
  146. diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  147. index 949319c..4187691 100644
  148. --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  149. +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  150. @@ -2360,7 +2360,7 @@ public class DcTracker extends DcTrackerBase {
  151. }
  152.  
  153. private boolean isNvSubscription() {
  154. - int radioTech = mPhone.getServiceState().getRilDataRadioTechnology();
  155. + int radioTech = mPhone.getServiceState().getRilVoiceRadioTechnology();
  156. if (mCdmaSsm == null) {
  157. return false;
  158. }
  159. --
  160. 2.6.4
  161.  
  162.  
  163. From b120d57f0ecc28c9d8719a05466c75b0f44677b6 Mon Sep 17 00:00:00 2001
  164. From: Gabriele M <moto.falcon.git@gmail.com>
  165. Date: Tue, 15 Dec 2015 00:55:50 +0100
  166. Subject: [PATCH 4/4] DcTracker: Always create dummy APNs for 3GPP2
  167.  
  168. Change-Id: Ie55cbe4447600a65c2e4fc725338e1be3ab8c605
  169. ---
  170. .../telephony/dataconnection/DcTracker.java | 36 +++++++++++-----------
  171. 1 file changed, 18 insertions(+), 18 deletions(-)
  172.  
  173. diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  174. index 4187691..a2a6e59 100644
  175. --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  176. +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
  177. @@ -2397,21 +2397,25 @@ public class DcTracker extends DcTrackerBase {
  178. mAllApnSettings = new ArrayList<ApnSetting>();
  179. String operator = getOperatorNumeric();
  180. if (operator != null && !operator.isEmpty()) {
  181. - String selection = "numeric = '" + operator + "'";
  182. - String orderBy = "_id";
  183. - // query only enabled apn.
  184. - // carrier_enabled : 1 means enabled apn, 0 disabled apn.
  185. - // selection += " and carrier_enabled = 1";
  186. - if (DBG) log("createAllApnList: selection=" + selection);
  187. -
  188. - Cursor cursor = mPhone.getContext().getContentResolver().query(
  189. - Telephony.Carriers.CONTENT_URI, null, selection, null, orderBy);
  190. -
  191. - if (cursor != null) {
  192. - if (cursor.getCount() > 0) {
  193. - mAllApnSettings = createApnList(cursor);
  194. + if (isDummyProfileNeeded()) {
  195. + addDummyApnSettings(operator);
  196. + } else {
  197. + String selection = "numeric = '" + operator + "'";
  198. + String orderBy = "_id";
  199. + // query only enabled apn.
  200. + // carrier_enabled : 1 means enabled apn, 0 disabled apn.
  201. + // selection += " and carrier_enabled = 1";
  202. + if (DBG) log("createAllApnList: selection=" + selection);
  203. +
  204. + Cursor cursor = mPhone.getContext().getContentResolver().query(
  205. + Telephony.Carriers.CONTENT_URI, null, selection, null, orderBy);
  206. +
  207. + if (cursor != null) {
  208. + if (cursor.getCount() > 0) {
  209. + mAllApnSettings = createApnList(cursor);
  210. + }
  211. + cursor.close();
  212. }
  213. - cursor.close();
  214. }
  215. }
  216.  
  217. @@ -2419,10 +2423,6 @@ public class DcTracker extends DcTrackerBase {
  218.  
  219. dedupeApnSettings();
  220.  
  221. - if (mAllApnSettings.isEmpty() && isDummyProfileNeeded()) {
  222. - addDummyApnSettings(operator);
  223. - }
  224. -
  225. if (mAllApnSettings.isEmpty()) {
  226. if (DBG) log("createAllApnList: No APN found for carrier: " + operator);
  227. mPreferredApn = null;
  228. --
  229. 2.6.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!