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

Commit d3d0c8af authored by Sarah Chin's avatar Sarah Chin
Browse files

[DO NOT MERGE] Prevent incorrect AsyncResult cast 

Test: atest DataConnectionTest
Bug: 152710026
Change-Id: I9aa710e5dc4b9d0f95a0a6bfda0d728bee472614
Merged-In: I01b7496334bd1fc8274d0c6a2de6cbc39f3f4931
parent 452b34df

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

+2 −2
Original line number Diff line number Diff line
@@ -2206,8 +2206,6 @@ public class DataConnection extends StateMachine { 
                    retVal = HANDLED;

                    break;

                }

                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:

                    boolean isUnmetered = (boolean) msg.obj;

                    if (isUnmetered == mUnmeteredOverride) {
@@ -2216,6 +2214,8 @@ public class DataConnection extends StateMachine { 
                    }

                    mUnmeteredOverride = isUnmetered;

                    // fallthrough

                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {

                    updateNetworkInfo();

                    if (mNetworkAgent != null) {