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

Commit 4adac653 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed NPE 

Fixed crash when two graceful tear down performed on the same
data network.

Bug: 233284182
Test: atest DataNetworkControllerTest + basic testing
Change-Id: I596c8174ab6f3ef595067b10b7e43598a79260dd
parent 9882dc97

src/java/com/android/internal/telephony/data/DataNetworkController.java

+6 −2
Original line number Diff line number Diff line
@@ -3385,8 +3385,12 @@ public class DataNetworkController extends Handler { 
                    + (mRegisteredImsFeatures.contains(ImsFeature.FEATURE_RCS)

                    ? "registered" : "not registered")

            );

            mPendingImsDeregDataNetworks.put(dataNetwork,

                    dataNetwork.tearDownWhenConditionMet(reason, deregDelay));

            Runnable runnable = dataNetwork.tearDownWhenConditionMet(reason, deregDelay);

            if (runnable != null) {

                mPendingImsDeregDataNetworks.put(dataNetwork, runnable);

            } else {

                log(dataNetwork + " is being torn down already.");

            }

        } else {

            // Graceful tear down is not turned on. Tear down the network immediately.

            log("tearDownGracefully: Safe to tear down " + dataNetwork);