aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/org
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 20:02:21 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 20:02:21 +0200
commit0ac71bdacc0db01ce195ab92673b494e4ff6bf34 (patch)
tree67ede43d05cc3ed09cd9452b903a01c025da6255 /tests/src/org
parent73652644f26b3cd0cbc7a2a4a310cee4d10dc38b (diff)
parent9d47788ad96807342bc72106a5bc86e73615e2ae (diff)
downloadvendor_cmsdk-replicant-6.0.zip
vendor_cmsdk-replicant-6.0.tar.gz
vendor_cmsdk-replicant-6.0.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/cm_platform_sdk into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'tests/src/org')
-rw-r--r--tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java b/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
index ca5b681..c2b01c2 100644
--- a/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
+++ b/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
@@ -104,8 +104,8 @@ public class CMPartnerInterfaceTest extends AndroidTestCase {
}
private boolean getAirplaneModeEnabled() {
- return Settings.System.getInt(getContext().getContentResolver(),
- Settings.System.AIRPLANE_MODE_ON, 0) == 1;
+ return Settings.Global.getInt(getContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
}
/////////////////////////////////////////////////////