PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Avoid access Controller from Slice" am: 5fb5d21b2d am: 9901d4262a am: 0e92e71139

Browse Source 
Change-Id: I1773f81561c53e1a69204e2c3d58a00c16ff5f09
This commit is contained in:
Automerger Merge Worker
2019-12-13 08:34:33 +00:00
parent f455e1719e 0e92e71139
commit ac838cd258
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/MobileDataSlice.java
View File

@@ -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