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

Commit 4bc2c217 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes I927cc046,I29c50c3b am: 837f0ebd am: 8ea033a4 

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

Change-Id: Ib647a6d3cb53d2083d4e7ed7b67ed8a2f66be784
parents 31448b20 8ea033a4

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+5 −3
Original line number Diff line number Diff line
@@ -340,9 +340,11 @@ public class GsmCdmaPhone extends Phone { 
            mTransportManager.registerDataThrottler(dcTracker.getDataThrottler());

        }



        if (false/*isUsingNewDataStack()*/) {

            mDataNetworkController = mTelephonyComponentFactory.inject(

                    DataNetworkController.class.getName())

                    .makeDataNetworkController(this, getLooper());

        }



        mCarrierResolver = mTelephonyComponentFactory.inject(CarrierResolver.class.getName())

                .makeCarrierResolver(this);