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

Commit e4000693 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed NPE" into tm-dev am: a4c6fff8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18513131



Change-Id: I23cbcf8f730d962610762169c7cfe048c03beb9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a116ecf9 a4c6fff8

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);