From 40ce30096cd2c5c242558d99fa43f956a7035394 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Fri, 9 Jun 2017 13:47:04 -0700
Subject: [PATCH] Fix broadcast radio instrumentation tests.

The ACCESS_FM_RADIO permission is required for accessing radio service.

Test: instrumentation
Bug: 62264079
Change-Id: Iddb45911602b7abc7e5c7ebc42f49bc6c869bb1a
---
 tests/radio/Android.mk                                      | 2 ++
 tests/radio/AndroidManifest.xml                             | 2 ++
 tests/radio/src/android/hardware/radio/tests/RadioTest.java | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/tests/radio/Android.mk b/tests/radio/Android.mk
index dc55d0bb0b58d..35d3309c7b86e 100644
--- a/tests/radio/Android.mk
+++ b/tests/radio/Android.mk
@@ -18,6 +18,8 @@ include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := RadioTests
 
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := tests
 # TODO(b/13282254): uncomment when b/13282254 is fixed
 # LOCAL_SDK_VERSION := current
diff --git a/tests/radio/AndroidManifest.xml b/tests/radio/AndroidManifest.xml
index 150edbffe8f8b..d84674fd0b6cd 100644
--- a/tests/radio/AndroidManifest.xml
+++ b/tests/radio/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.hardware.radio.tests">
 
+    <uses-permission android:name="android.permission.ACCESS_FM_RADIO" />
+
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
diff --git a/tests/radio/src/android/hardware/radio/tests/RadioTest.java b/tests/radio/src/android/hardware/radio/tests/RadioTest.java
index 47e104ce03e3a..82ce4393f44a6 100644
--- a/tests/radio/src/android/hardware/radio/tests/RadioTest.java
+++ b/tests/radio/src/android/hardware/radio/tests/RadioTest.java
@@ -15,6 +15,7 @@
  */
 package android.hardware.radio.tests;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.radio.RadioManager;
@@ -83,6 +84,11 @@ public class RadioTest {
         boolean isRadioSupported = packageManager.hasSystemFeature(PackageManager.FEATURE_RADIO);
         assumeTrue(isRadioSupported);
 
+        // Check radio access permission
+        int res = mContext.checkCallingOrSelfPermission(Manifest.permission.ACCESS_FM_RADIO);
+        assertEquals("ACCESS_FM_RADIO permission not granted",
+                PackageManager.PERMISSION_GRANTED, res);
+
         mRadioManager = (RadioManager)mContext.getSystemService(Context.RADIO_SERVICE);
         assertNotNull(mRadioManager);