diff options
| author | Wink Saville <wink@google.com> | 2011-05-20 17:26:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-20 17:26:58 -0700 |
| commit | f8d70b14e4285d17d83cc4853f50b44d6a55fbc7 (patch) | |
| tree | a864bf37336ab961531d1e8a121fafcf4ff6b791 | |
| parent | b7a13791a12eef57434b84a97609d98e03e17009 (diff) | |
| parent | 5f353de96beca0a400796887e737314a62e35b6a (diff) | |
| download | frameworks_base-f8d70b14e4285d17d83cc4853f50b44d6a55fbc7.zip frameworks_base-f8d70b14e4285d17d83cc4853f50b44d6a55fbc7.tar.gz frameworks_base-f8d70b14e4285d17d83cc4853f50b44d6a55fbc7.tar.bz2 | |
am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnection.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index 2e781b2..1ac9d1f 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -249,6 +249,8 @@ public abstract class DataConnection extends StateMachine { Message m = dp.onCompletedMsg; if (TextUtils.equals(dp.reason, Phone.REASON_RADIO_TURNED_OFF)) { discReason = RILConstants.DEACTIVATE_REASON_RADIO_OFF; + } else if (TextUtils.equals(dp.reason, Phone.REASON_PDP_RESET)) { + discReason = RILConstants.DEACTIVATE_REASON_PDP_RESET; } } if (phone.mCM.getRadioState().isOn()) { diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index f5d6c51..93fc9ce 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -113,6 +113,7 @@ public interface RILConstants { /* Deactivate data call reasons */ int DEACTIVATE_REASON_NONE = 0; int DEACTIVATE_REASON_RADIO_OFF = 1; + int DEACTIVATE_REASON_PDP_RESET = 2; /* cat include/telephony/ril.h | \ |