cmsdk: Fix tests for N
Change-Id: I49175f9e60440ea40993d1d7a0cc3f64cf92d010
This commit is contained in:
@@ -136,12 +136,14 @@ public class CMPartnerInterfaceTest extends AndroidTestCase {
|
||||
mNotificationManager = INotificationManager.Stub.asInterface(
|
||||
ServiceManager.getService(Context.NOTIFICATION_SERVICE));
|
||||
|
||||
/*
|
||||
mConditionListener = new CountdownConditionListener();
|
||||
try {
|
||||
mNotificationManager.requestZenModeConditions(mConditionListener, Condition.FLAG_RELEVANT_ALWAYS);
|
||||
} catch (RemoteException e) {
|
||||
fail("requestZenModeConditions exception " + e);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
private void teardownZenModeTests() {
|
||||
|
||||
@@ -36,7 +36,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
Toast.makeText(CMTelephonyTest.this, "Test default sub active "
|
||||
+ cmTelephonyManager.isSubActive(
|
||||
SubscriptionManager.getDefaultSubId()),
|
||||
SubscriptionManager.getDefaultSubscriptionId()),
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
},
|
||||
@@ -44,7 +44,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
public void run() {
|
||||
CMTelephonyManager cmTelephonyManager =
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
cmTelephonyManager.setSubState(SubscriptionManager.getDefaultSubId(), true);
|
||||
cmTelephonyManager.setSubState(SubscriptionManager.getDefaultSubscriptionId(), true);
|
||||
}
|
||||
},
|
||||
new Test("test is data enabled on default sub") {
|
||||
@@ -53,7 +53,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
Toast.makeText(CMTelephonyTest.this, "Test default sub data "
|
||||
+ cmTelephonyManager.isDataConnectionSelectedOnSub(
|
||||
SubscriptionManager.getDefaultSubId()),
|
||||
SubscriptionManager.getDefaultSubscriptionId()),
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
},
|
||||
@@ -78,7 +78,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
CMTelephonyManager cmTelephonyManager =
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
cmTelephonyManager.setDataConnectionSelectedOnSub(
|
||||
SubscriptionManager.getDefaultSubId());
|
||||
SubscriptionManager.getDefaultSubscriptionId());
|
||||
}
|
||||
},
|
||||
new Test("test setDefaultPhoneSub") {
|
||||
@@ -86,7 +86,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
CMTelephonyManager cmTelephonyManager =
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
cmTelephonyManager.setDefaultPhoneSub(
|
||||
SubscriptionManager.getDefaultSubId());
|
||||
SubscriptionManager.getDefaultSubscriptionId());
|
||||
}
|
||||
},
|
||||
new Test("test setDefaultSmsSub") {
|
||||
@@ -94,7 +94,7 @@ public class CMTelephonyTest extends TestActivity {
|
||||
CMTelephonyManager cmTelephonyManager =
|
||||
CMTelephonyManager.getInstance(CMTelephonyTest.this);
|
||||
cmTelephonyManager.setDefaultSmsSub(
|
||||
SubscriptionManager.getDefaultSubId());
|
||||
SubscriptionManager.getDefaultSubscriptionId());
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user