diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-22 04:02:38 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-22 04:02:38 -0800 |
| commit | ad4585970a5901286891ed9a5b4cc6f1e3e6ea80 (patch) | |
| tree | a9cad3f3bb1f4dd383ca22062da74ed31357c685 /src/java/com/android/internal/telephony | |
| parent | 49db539e831f27885991345c18c30e8dcf3d6046 (diff) | |
| parent | 1e7f0dffb8bf8db3cd0ead362e1a934885182200 (diff) | |
| download | frameworks_opt_telephony-ad4585970a5901286891ed9a5b4cc6f1e3e6ea80.zip frameworks_opt_telephony-ad4585970a5901286891ed9a5b4cc6f1e3e6ea80.tar.gz frameworks_opt_telephony-ad4585970a5901286891ed9a5b4cc6f1e3e6ea80.tar.bz2 | |
Merge "QualcommSharedRIL: allow skipping pin/puk count" into cm-10.1
Diffstat (limited to 'src/java/com/android/internal/telephony')
| -rw-r--r-- | src/java/com/android/internal/telephony/QualcommSharedRIL.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/java/com/android/internal/telephony/QualcommSharedRIL.java b/src/java/com/android/internal/telephony/QualcommSharedRIL.java index 16a912b..db22133 100644 --- a/src/java/com/android/internal/telephony/QualcommSharedRIL.java +++ b/src/java/com/android/internal/telephony/QualcommSharedRIL.java @@ -179,10 +179,12 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface { ca.pin1_replaced = p.readInt(); ca.pin1 = ca.PinStateFromRILInt(p.readInt()); ca.pin2 = ca.PinStateFromRILInt(p.readInt()); - p.readInt(); //remaining_count_pin1 - p.readInt(); //remaining_count_puk1 - p.readInt(); //remaining_count_pin2 - p.readInt(); //remaining_count_puk2 + if (!needsOldRilFeature("skippinpukcount")) { + p.readInt(); //remaining_count_pin1 + p.readInt(); //remaining_count_puk1 + p.readInt(); //remaining_count_pin2 + p.readInt(); //remaining_count_puk2 + } status.mApplications[i] = ca; } int appIndex = -1; |