From 5dec2bb8fca836dafb01fd743d6593dbdee65134 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 8 Sep 2016 16:09:53 -0700
Subject: [PATCH] cmsdk: Fix tests for N

Change-Id: I49175f9e60440ea40993d1d7a0cc3f64cf92d010
---
 .../tests/settings/unit/CMPartnerInterfaceTest.java  |  2 ++
 .../cyanogenmod/tests/telephony/CMTelephonyTest.java | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java b/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
index ca5b6811..ed289f03 100644
--- a/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
+++ b/tests/src/org/cyanogenmod/tests/settings/unit/CMPartnerInterfaceTest.java
@@ -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() {
diff --git a/tests/src/org/cyanogenmod/tests/telephony/CMTelephonyTest.java b/tests/src/org/cyanogenmod/tests/telephony/CMTelephonyTest.java
index a7f4c700..1f184f72 100644
--- a/tests/src/org/cyanogenmod/tests/telephony/CMTelephonyTest.java
+++ b/tests/src/org/cyanogenmod/tests/telephony/CMTelephonyTest.java
@@ -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());
                 }
             },
     };