commit 39a8dcb58a6a1bf128bbdff7e1f183edb604a881
author Christopher Hocutt <hocutt@google.com> Thu Oct 01 22:01:02 2015 +0000
committer Christopher Hocutt <hocutt@google.com> Thu Oct 01 23:12:42 2015 +0000
tree 53b13e6b01fdf4a1525c808039ee929c13f24e34
parent 720504c7f1b8135bb4a37e2e7d2be1d3fef98654

Separating phone and telecom specific protected broadcasts.  Bug: 23192492

This fixes commit 720504c7f1b8135bb4a37e2e7d2be1d3fef98654.

Change-Id: Ic5215e9be38b8624b40390aaa55f4e1ad286d779

tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java

diff --git a/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java b/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
index 387cd18..9ef0480 100644
--- a/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
@@ -263,7 +263,7 @@
         "com.android.server.WifiManager.action.START_PNO",
         "com.android.server.WifiManager.action.START_SCAN"
     };
-    private static final String PHONE_BROADCASTS = new String[] {
+    private static final String PHONE_BROADCASTS[] = new String[] {
         "android.intent.action.ACTION_MDN_STATE_CHANGED",
         "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS",
         "android.intent.action.ANY_DATA_STATE",
@@ -291,7 +291,7 @@
         "com.android.internal.telephony.data-restart-trysetup",
         "com.android.internal.telephony.data-stall"
     };
-    private static final String TELECOM_BROADCASTS = new String[] {
+    private static final String TELECOM_BROADCASTS[] = new String[] {
         "android.intent.action.SHOW_MISSED_CALLS_NOTIFICATION"
     };
 
@@ -309,7 +309,8 @@
             }
         }
         try {
-            PackageInfo packageInfo = packageManager.getPackageInfo("com.android.phone", NO_FLAGS);
+            PackageInfo packageInfo =
+                    getPackageManager().getPackageInfo("com.android.phone", 0);
             for (String action : PHONE_BROADCASTS) {
                 try {
                     Intent intent = new Intent(action);
@@ -325,7 +326,7 @@
         }
         try {
             PackageInfo packageInfo =
-                    packageManager.getPackageInfo("com.android.server.telecom", NO_FLAGS);
+                    getPackageManager().getPackageInfo("com.android.server.telecom", 0);
             for (String action : TELECOM_BROADCASTS) {
                 try {
                     Intent intent = new Intent(action);
@@ -339,4 +340,4 @@
           // this catch intentionally left empty
         }
     }
-}
\ No newline at end of file
+}