commit a0e75473d3e616783f5205399da877652145b3cb
author fionaxu <fionaxu@google.com> Mon Sep 12 10:30:38 2016 -0700
committer fionaxu <fionaxu@google.com> Mon Sep 12 10:30:38 2016 -0700
tree bd6886888567e3fbb027667f01b3e4e68c7577dc
parent c65350d69a6dd0e7db8efa082d608c90b0756aa2

Fix CTS test failure

skip checking telephony protected broadcast when there is no Telephony
Package

Bug: 31039972
Change-Id: I396806152b020ce5e0a4c61fd2cded9c4c249f71

tests/tests/security/src/android/security/cts/STKFrameworkTest.java

diff --git a/tests/tests/security/src/android/security/cts/STKFrameworkTest.java b/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
index 1fae3c8..a30387f 100644
--- a/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
+++ b/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
@@ -17,12 +17,17 @@
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.test.AndroidTestCase;
 
 public class STKFrameworkTest extends AndroidTestCase {
+    private boolean mHasTelephony;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        mHasTelephony = getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY);
     }
 
     @Override
@@ -35,6 +40,10 @@
      * zero-permission malicious application
      */
     public void testInterceptedSIMCommandsToTelephony() {
+        if (!mHasTelephony) {
+            return;
+        }
+
         Intent intent = new Intent();
         intent.setAction("android.intent.action.stk.command");
         intent.putExtra("STK CMD", "test");