Merge commit '6bc40988' into fix-merge-conflict
Wink Saville [Mon, 15 Sep 2014 21:40:14 +0000 (14:40 -0700)]
* commit '6bc40988':
  ksd to lmp-sprout-dev

Conflicts:
src/java/android/telephony/MessagingConfigurationManager.java
src/java/android/telephony/SmsManager.java
src/java/com/android/internal/telephony/IccProvider.java
src/java/com/android/internal/telephony/PhoneSubInfoProxy.java
src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
src/java/com/android/internal/telephony/SubscriptionController.java
src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/dataconnection/DctController.java

Change-Id: I4e1c9d8c7d4f541152f13e21825aa96dd56b126f

15 files changed:
1  2 
src/java/com/android/internal/telephony/BaseCommands.java
src/java/com/android/internal/telephony/CallManager.java
src/java/com/android/internal/telephony/Phone.java
src/java/com/android/internal/telephony/PhoneBase.java
src/java/com/android/internal/telephony/PhoneProxy.java
src/java/com/android/internal/telephony/PhoneSubInfoController.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/gsm/GSMPhone.java
src/java/com/android/internal/telephony/uicc/IccCardProxy.java
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
src/java/com/android/internal/telephony/uicc/UiccCard.java

@@@ -1294,7 -1294,10 +1294,9 @@@ public final class DcTracker extends Dc
          createAllApnList();
          setInitialAttachApn();
          cleanUpAllConnections(!isDisconnected, Phone.REASON_APN_CHANGED);
-         setupDataOnConnectableApns(Phone.REASON_APN_CHANGED);
 -        if (isDisconnected &&
 -                (mPhone.getSubId() == SubscriptionManager.getDefaultDataSubId())) {
++        if (mPhone.getSubId() == SubscriptionManager.getDefaultDataSubId()) {
+             setupDataOnConnectableApns(Phone.REASON_APN_CHANGED);
+         }
      }
  
      /**
@@@ -93,9 -92,8 +93,9 @@@ public class UiccCard 
      private static final int EVENT_TRANSMIT_APDU_LOGICAL_CHANNEL_DONE = 17;
      private static final int EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE = 18;
      private static final int EVENT_SIM_IO_DONE = 19;
 +    private static final int EVENT_CARRIER_PRIVILIGES_LOADED = 20;
  
-     int mSlotId;
+     private int mSlotId;
  
      public UiccCard(Context c, CommandsInterface ci, IccCardStatus ics) {
          if (DBG) log("Creating");