commit 22c3bbde1128029c4d4e6fe34ee0b56f530629ac
author Elliott Hughes <enh@google.com> Wed Feb 27 02:11:39 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 27 02:11:39 2013 +0000
tree 608e735ae72729af7c4f8a294d2eeeb36ed23633
parent b575731e4aa3fb4ea361173e72c387574ae779a6
parent 96c87e2f014207dc5c55f7c8fafd1e666080d784

Merge "Fix build."

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
index d92488e..9a84303 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
@@ -223,6 +223,7 @@
         switch (cm.getRadioState()) {
             case RADIO_UNAVAILABLE:
                 newSS.setStateOutOfService();
+                mLteSS.setStateOutOfService();
                 newCellLoc.setStateInvalid();
                 setSignalStrengthDefaultValues();
                 mGotCountryCode = false;
@@ -232,6 +233,7 @@
 
             case RADIO_OFF:
                 newSS.setStateOff();
+                mLteSS.setStateOff();
                 newCellLoc.setStateInvalid();
                 setSignalStrengthDefaultValues();
                 mGotCountryCode = false;

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
old mode 100755
new mode 100644
index a6f5aaf..5909ec2
--- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -832,6 +832,7 @@
         switch (cm.getRadioState()) {
         case RADIO_UNAVAILABLE:
             newSS.setStateOutOfService();
+            mNewDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
             newCellLoc.setStateInvalid();
             setSignalStrengthDefaultValues();
             mGotCountryCode = false;
@@ -841,6 +842,7 @@
 
         case RADIO_OFF:
             newSS.setStateOff();
+            mNewDataConnectionState = ServiceState.STATE_POWER_OFF;
             newCellLoc.setStateInvalid();
             setSignalStrengthDefaultValues();
             mGotCountryCode = false;

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index bd13374..25ac850 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -745,6 +745,7 @@
         switch (cm.getRadioState()) {
             case RADIO_UNAVAILABLE:
                 newSS.setStateOutOfService();
+                newGPRSState = ServiceState.STATE_OUT_OF_SERVICE;
                 newCellLoc.setStateInvalid();
                 setSignalStrengthDefaultValues();
                 mGotCountryCode = false;
@@ -754,6 +755,7 @@
 
             case RADIO_OFF:
                 newSS.setStateOff();
+                newGPRSState = ServiceState.STATE_POWER_OFF;
                 newCellLoc.setStateInvalid();
                 setSignalStrengthDefaultValues();
                 mGotCountryCode = false;