diff options
| author | Giulio Cervera <giulio.cervera@cyanogenmod.org> | 2013-07-14 08:56:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-14 08:56:22 -0700 |
| commit | d0ed847fb54cc9136b4be3106b764bb32e847866 (patch) | |
| tree | 036b3fc39f8e191b6df2538bb1bc0665d433b97a | |
| parent | 6db6ae33cb3678e5ca1c2181a773bc076dafa6f2 (diff) | |
| parent | 868d5454edc441025433ca3ff45be97256a8ef24 (diff) | |
| download | android_frameworks_base-jellybean.tar.gz android_frameworks_base-jellybean.tar.bz2 android_frameworks_base-jellybean.zip | |
Merge "telephony: update Sony RIL" into jellybeanjellybean
| -rw-r--r-- | telephony/java/com/android/internal/telephony/SonyQualcommRIL.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/SonyQualcommRIL.java b/telephony/java/com/android/internal/telephony/SonyQualcommRIL.java index 102d608cf82..3f58bae3e65 100644 --- a/telephony/java/com/android/internal/telephony/SonyQualcommRIL.java +++ b/telephony/java/com/android/internal/telephony/SonyQualcommRIL.java @@ -234,7 +234,9 @@ public class SonyQualcommRIL extends QualcommSharedRIL implements CommandsInterf rr.mp.writeInt(uusInfo.getDcs()); rr.mp.writeByteArray(uusInfo.getUserData()); } - rr.mp.writeInt(255); + + if (!needsOldRilFeature("qcomdsds")) + rr.mp.writeInt(255); if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)); @@ -246,7 +248,7 @@ public class SonyQualcommRIL extends QualcommSharedRIL implements CommandsInterf RILRequest rr; if (operatorNumeric == null) - rr = RILRequest.obtain(RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, response); + rr = RILRequest.obtain(RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, response); else rr = RILRequest.obtain(RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, response); |