commit 8937713e016bfd5fdb088f9f23edd4c85628a4bb
author Sarah Chin <sarahchin@google.com> Fri Mar 18 21:51:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 18 21:51:16 2022 +0000
tree cd462c77e6d2261b40abb5ba85c1f55892782e7c
parent 828ebd455d761a0b64da4acdf9024afcd4c27226
parent 81c6d766a91bee790cf301946c786ce5b52656cd

Merge "Clean up DataSettingsManager calls" am: 81c6d766a9

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2032431

Change-Id: Ie99556185f6b328e905bd98dd76cab3291cf6899

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f7a7b74..7e7ca07 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6616,8 +6616,7 @@
             if (phone != null) {
                 boolean retVal;
                 if (phone.isUsingNewDataStack()) {
-                    retVal = phone.getDataNetworkController().getDataSettingsManager()
-                            .isDataEnabled();
+                    retVal = phone.getDataSettingsManager().isDataEnabled();
                 } else {
                     retVal = phone.getDataEnabledSettings().isDataEnabled();
                 }