commit 9901d4262a913306c38b703b9c2a3a8809504640
author Bonian Chen <bonianchen@google.com> Fri Dec 13 00:13:43 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 13 00:13:43 2019 -0800
tree 1a782c100c9f68b2a601a78f746be7c8565329c0
parent 027a9244f1d002f509df473e10ef1ab5bfa44250
parent 5fb5d21b2d062677e5f87210551a70d4db757aaa

Merge "[Settings] Avoid access Controller from Slice"
am: 5fb5d21b2d

Change-Id: Ie946dc9fe7ec3dcb6634386e4498b118fa2f8faf

src/com/android/settings/network/telephony/MobileDataSlice.java

diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index 65eaf87..152028c 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -38,11 +38,11 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.network.MobileDataContentObserver;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
 import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settingslib.WirelessUtils;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -184,10 +184,7 @@
 
     @VisibleForTesting
     boolean isAirplaneModeEnabled() {
-        // Generic key since we only want the method check - no UI.
-        AirplaneModePreferenceController controller = new AirplaneModePreferenceController(mContext,
-                "key" /* Key */);
-        return controller.isChecked();
+        return WirelessUtils.isAirplaneModeOn(mContext);
     }
 
     @VisibleForTesting