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

Commit ac838cd2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Settings] Avoid access Controller from Slice" am: 5fb5d21b am: 9901d426 am: 0e92e711 

Change-Id: I1773f81561c53e1a69204e2c3d58a00c16ff5f09
parents f455e171 0e92e711

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

+2 −5
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ import androidx.slice.builders.SliceAction; 


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 @@ public class MobileDataSlice implements CustomSliceable { 


    @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