Update CTS tests for moved notifyCarrierNetworkChange() API
Bug: 21630803
Bug: 21572049
Bug: 21721768
Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
diff --git a/tests/tests/telephony/src/android/telephony/cts/CarrierServiceTest.java b/tests/tests/telephony/src/android/telephony/cts/CarrierServiceTest.java
new file mode 100644
index 0000000..492f8ff
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/CarrierServiceTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.telephony.cts;
+
+import android.content.Intent;
+import android.os.PersistableBundle;
+import android.service.carrier.CarrierIdentifier;
+import android.service.carrier.CarrierService;
+import android.test.ServiceTestCase;
+
+public class CarrierServiceTest extends ServiceTestCase<CarrierServiceTest.TestCarrierService> {
+ public CarrierServiceTest() { super(TestCarrierService.class); }
+
+ public void testNotifyCarrierNetworkChange_true() {
+ notifyCarrierNetworkChange(true);
+ }
+
+ public void testNotifyCarrierNetworkChange_false() {
+ notifyCarrierNetworkChange(false);
+ }
+
+ private void notifyCarrierNetworkChange(boolean active) {
+ Intent intent = new Intent(getContext(), TestCarrierService.class);
+ startService(intent);
+
+ try {
+ getService().notifyCarrierNetworkChange(active);
+ fail("Expected SecurityException for notifyCarrierNetworkChange(" + active + ")");
+ } catch (SecurityException e) { /* Expected */ }
+ }
+
+ public static class TestCarrierService extends CarrierService {
+ @Override
+ public PersistableBundle onLoadConfig(CarrierIdentifier id) { return null; }
+ }
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java b/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
index 3279abe..20810a8 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
@@ -22,8 +22,7 @@
import android.test.AndroidTestCase;
public class SimRestrictedApisTest extends AndroidTestCase {
- private static final byte[] TEST_PDU = {
- 0, 0 };
+ private static final byte[] TEST_PDU = { 0, 0 };
private TelephonyManager mTelephonyManager;
@Override
@@ -266,24 +265,4 @@
} catch (SecurityException expected) {
}
}
-
- /**
- * Tests the TelephonyManager.notifyCarrierNetworkChange() API to make sure a
- * SecurityException is thrown since the test APK is not signed by a certificate on the SIM.
- */
- public void testNotifyCarrierNetworkChange() {
- try {
- if (isSimCardPresent()) {
- TelephonyManager.getDefault().notifyCarrierNetworkChange(true /* active */);
- fail("Expected SecurityException for notifyCarrierNetworkChange(true)");
- }
- } catch (SecurityException expected) {}
-
- try {
- if (isSimCardPresent()) {
- TelephonyManager.getDefault().notifyCarrierNetworkChange(false /* active */);
- fail("Expected SecurityException for notifyCarrierNetworkChange(false)");
- }
- } catch (SecurityException expected) {}
- }
}
