Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859f7a91 authored by Wink Saville's avatar Wink Saville
Browse files

Assume LTE location info is base 10 but allow 16 or 8. 

Previously it was base 16 but somewhere along the line it changed
to base 10. The code is now changed to use the decode method which
assumes base 10 but also accepts base 16 (prefix 0x, 0X, #) or
base 8 (prefix 0).

Bug:  7651566
Change-Id: Icae05dcbee9c1092fce2f594a1e179bbd3e1426a
parent e7fd4f72

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

+7 −4
Original line number Diff line number Diff line
@@ -167,29 +167,32 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
                                operatorNumeric + " e=" + e);

                        mnc = Integer.MAX_VALUE;

                    }



                    // Use Integer#decode to be generous in what we receive and allow

                    // decimal, hex or octal values.

                    try {

                        tac = Integer.parseInt(states[6], 16);

                        tac = Integer.decode(states[6]);

                    } catch (Exception e) {

                        loge("handlePollStateResultMessage: bad tac states[6]=" +

                                states[6] + " e=" + e);

                        tac = Integer.MAX_VALUE;

                    }

                    try {

                        pci = Integer.parseInt(states[7], 16);

                        pci = Integer.decode(states[7]);

                    } catch (Exception e) {

                        loge("handlePollStateResultMessage: bad pci states[7]=" +

                                states[7] + " e=" + e);

                        pci = Integer.MAX_VALUE;

                    }

                    try {

                        eci = Integer.parseInt(states[8], 16);

                        eci = Integer.decode(states[8]);

                    } catch (Exception e) {

                        loge("handlePollStateResultMessage: bad eci states[8]=" +

                                states[8] + " e=" + e);

                        eci = Integer.MAX_VALUE;

                    }

                    try {

                        csgid = Integer.parseInt(states[9], 16);

                        csgid = Integer.decode(states[9]);

                    } catch (Exception e) {

                        // FIX: Always bad so don't pollute the logs

                        // loge("handlePollStateResultMessage: bad csgid states[9]=" +