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

Browse Source 
Change-Id: I842ec0be059ce9c2ee09ea80a344beeb071cfa22
This commit is contained in:
Automerger Merge Worker
2019-12-13 08:25:51 +00:00
parent f0bcac5280 9901d4262a
commit 0e92e71139
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.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.network.MobileDataContentObserver; import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.WirelessUtils;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@@ -184,10 +184,7 @@ public class MobileDataSlice implements CustomSliceable {
@VisibleForTesting @VisibleForTesting
boolean isAirplaneModeEnabled() { boolean isAirplaneModeEnabled() {
// Generic key since we only want the method check - no UI. return WirelessUtils.isAirplaneModeOn(mContext);
AirplaneModePreferenceController controller = new AirplaneModePreferenceController(mContext,
"key" /* Key */);
return controller.isChecked();
} }
@VisibleForTesting @VisibleForTesting