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

Commit ed68de07 authored by Danny Baumann's avatar Danny Baumann Committed by Ricardo Cerqueira
Browse files

Don't use invalid phone IDs as index. 

phoneId can be -1 via this path, triggered via SimBootReceiver:
java.lang.Throwable
     at com.android.internal.telephony.dataconnection.DctController$SwitchInfo.<init>(DctController.java:743)
     at com.android.internal.telephony.dataconnection.DctController.setDefaultDataSubId(DctController.java:781)
     at com.android.internal.telephony.SubscriptionController.setDefaultDataSubId(SubscriptionController.java:1443)
     at com.android.internal.telephony.SubscriptionController.clearDefaultsForInactiveSubIds(SubscriptionController.java:1533)
     at com.android.internal.telephony.ISub$Stub.onTransact(ISub.java:307)
     at android.os.Binder.execTransact(Binder.java:446

Change-Id: Idf050fe5fff9b24cdbf890d0abc12d52fba21b3f
parent 2e374b88

src/java/com/android/internal/telephony/dataconnection/DctController.java

+8 −7
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ public class DctController extends Handler { 
                             mSubController.getCurrentDds());

                    mPhones[prefPhoneId].unregisterForAllDataDisconnected(this);

                }

                if (phoneId >= 0) {

                    Message allowedDataDone = Message.obtain(this,

                            EVENT_SET_DATA_ALLOW_DONE, s);

                    Phone phone = mPhones[phoneId].getActivePhone();
@@ -370,7 +371,7 @@ public class DctController extends Handler { 
                    informDefaultDdsToPropServ(phoneId);

                    DcTrackerBase dcTracker =((PhoneBase)phone).mDcTracker;

                    dcTracker.setDataAllowed(true, allowedDataDone);



                }

               break;

            }