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

Update airplane mode key to match framework constant

Browse Source 
Change pref key for airplane mode to "airplane_mode" to match the
constant declared in SettingsSlicesContract.

Bug: 80106671
Test: robotests
Change-Id: I898befffbdafc3004fc127414edd04f60ff2554e
This commit is contained in:
Matthew Fritze
2018-05-22 13:04:38 -07:00
parent c4a3393b45
commit 8f36eb8cfb
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -28,9 +28,7 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.provider.SettingsSlicesContract;
import android.util.Log;
import android.util.SparseArray;
@@ -47,6 +45,10 @@ import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class VpnPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
@@ -83,7 +85,7 @@ public class VpnPreferenceController extends AbstractPreferenceController
// Manually set dependencies for Wifi when not toggleable.
if (mToggleable == null || !mToggleable.contains(Settings.Global.RADIO_WIFI)) {
if (mPreference != null) {
mPreference.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
mPreference.setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
}
}
}