Revert "DO NOT MERGE Add CTS test for the security fix backport" am: 5f5dd1661e

am: 6a9ce27e32

Change-Id: I4e058fe0ba66479e1239a74805115d3f21ca83a4

1 files changed, 0 insertions, 86 deletions

diff --git a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/TelephonyProviderTest.java b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/TelephonyProviderTest.java
index d54260be9f6..f79439b65c2 100644
--- a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/TelephonyProviderTest.java
+++ b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/TelephonyProviderTest.java
@@ -18,7 +18,6 @@ package android.telephonyprovider.cts;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
-import android.net.Uri;
 import android.provider.Telephony.Carriers;
 import android.test.InstrumentationTestCase;
 
@@ -52,89 +51,4 @@ public class TelephonyProviderTest extends InstrumentationTestCase {
             fail("No access to current APN");
         }
     }
-
-    public void testNoAccessToPassword() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL AND "
-                    + Carriers.PASSWORD + " IS NOT NULL";
-            String[] selectionArgs = null;
-            Cursor cursor = mContentResolver.query(Carriers.CONTENT_URI,
-                    APN_PROJECTION, selection, selectionArgs, null);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
-
-    public void testNoAccessToPasswordThruSort() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL";
-            String[] selectionArgs = null;
-            String sort = "LIMIT CASE WHEN ((SELECT COUNT(*) FROM carriers WHERE"
-                    + " password LIKE 'a%') > 0) THEN 1 ELSE 0 END";
-            Cursor cursor = mContentResolver.query(Carriers.CONTENT_URI,
-                    APN_PROJECTION, selection, selectionArgs, sort);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
-
-    public void testNoAccessToPasswordThruMixedCase() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL";
-            String[] selectionArgs = null;
-            String sort = "LIMIT CASE WHEN ((SELECT COUNT(*) FROM carriers WHERE"
-                    + " PaSsWoRd LIKE 'a%') > 0) THEN 1 ELSE 0 END";
-            Cursor cursor = mContentResolver.query(Carriers.CONTENT_URI,
-                    APN_PROJECTION, selection, selectionArgs, sort);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
-
-    public void testNoAccessToUser() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL AND "
-                    + Carriers.USER + " IS NOT NULL";
-            String[] selectionArgs = null;
-            String sort = "LIMIT CASE WHEN ((SELECT COUNT(*) FROM carriers WHERE"
-                    + " user LIKE 'a%') > 0) THEN 1 ELSE 0 END";
-            Cursor cursor = mContentResolver.query(Carriers.CONTENT_URI,
-                    APN_PROJECTION, selection, selectionArgs, sort);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
-
-    public void testNoAccessViaSubqueries() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL";
-            String[] selectionArgs = null;
-            String sort = "LIMIT CASE WHEN ((SELECT COUNT(*) FROM carriers WHERE"
-                    + " mcc LIKE 'a%') > 0) THEN 1 ELSE 0 END";
-            Cursor cursor = mContentResolver.query(Carriers.CONTENT_URI,
-                    APN_PROJECTION, selection, selectionArgs, sort);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
-
-    public void testNoAccessToUserWithDifferentUri() {
-        try {
-            String selection = Carriers.CURRENT + " IS NOT NULL AND "
-                    + Carriers.USER + " IS NOT NULL";
-            String[] selectionArgs = null;
-            String sort = "LIMIT CASE WHEN ((SELECT COUNT(*) FROM carriers WHERE"
-                    + " user LIKE 'a%') > 0) THEN 1 ELSE 0 END";
-            Cursor cursor = mContentResolver.query(Uri.parse("content://telephony/siminfo"),
-                    APN_PROJECTION, selection, selectionArgs, sort);
-            fail("Expected SecurityException");
-        } catch (SecurityException e) {
-            // expected
-        }
-    }
 }