Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2017-07-25 17:18:50 +00:00
committed by Android (Google) Code Review
parent 64aa52c135 df77643cd8
commit 68a0dafc13
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -6,12 +6,13 @@ package android {
public static final class Manifest.permission {
ctor public Manifest.permission();
field public static final java.lang.String ACCESS_BROADCAST_RADIO = "android.permission.ACCESS_BROADCAST_RADIO";
field public static final java.lang.String ACCESS_CACHE_FILESYSTEM = "android.permission.ACCESS_CACHE_FILESYSTEM";
field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
field public static final java.lang.String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
field public static final java.lang.String ACCESS_DRM_CERTIFICATES = "android.permission.ACCESS_DRM_CERTIFICATES";
field public static final java.lang.String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";
field public static final java.lang.String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";
field public static final deprecated java.lang.String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";
field public static final java.lang.String ACCESS_LOCATION_EXTRA_COMMANDS = "android.permission.ACCESS_LOCATION_EXTRA_COMMANDS";
field public static final java.lang.String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
field public static final java.lang.String ACCESS_MTP = "android.permission.ACCESS_MTP";

7
core/res/AndroidManifest.xml
View File

@@ -1527,7 +1527,12 @@
<permission android:name="android.permission.HARDWARE_TEST"
android:protectionLevel="signature" />
<!-- @SystemApi Allows access to FM
<!-- @SystemApi Allows access to Broadcast Radio
@hide This is not a third-party API (intended for system apps).-->
<permission android:name="android.permission.ACCESS_BROADCAST_RADIO"
android:protectionLevel="signature|privileged" />
<!-- @deprecated @SystemApi Allows access to FM
@hide This is not a third-party API (intended for system apps).-->
<permission android:name="android.permission.ACCESS_FM_RADIO"
android:protectionLevel="signature|privileged" />

2
core/tests/BroadcastRadioTests/AndroidManifest.xml
View File

@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.hardware.radio.tests">
<uses-permission android:name="android.permission.ACCESS_FM_RADIO" />
<uses-permission android:name="android.permission.ACCESS_BROADCAST_RADIO" />
<application>
<uses-library android:name="android.test.runner" />

4
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/functional/RadioTunerTest.java
View File

@@ -91,8 +91,8 @@ public class RadioTunerTest {
assumeTrue(isRadioSupported);
// Check radio access permission
int res = mContext.checkCallingOrSelfPermission(Manifest.permission.ACCESS_FM_RADIO);
assertEquals("ACCESS_FM_RADIO permission not granted",
int res = mContext.checkCallingOrSelfPermission(Manifest.permission.ACCESS_BROADCAST_RADIO);
assertEquals("ACCESS_BROADCAST_RADIO permission not granted",
PackageManager.PERMISSION_GRANTED, res);
mRadioManager = (RadioManager)mContext.getSystemService(Context.RADIO_SERVICE);

2
data/etc/platform.xml
View File

@@ -107,7 +107,7 @@
<group gid="audio" />
</permission>
<permission name="android.permission.ACCESS_FM_RADIO" >
<permission name="android.permission.ACCESS_BROADCAST_RADIO" >
<!-- /dev/fm is gid media, not audio -->
<group gid="media" />
</permission>

4
services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java
View File

@@ -64,8 +64,8 @@ public class BroadcastRadioService extends SystemService {
private class ServiceImpl extends IRadioService.Stub {
private void enforcePolicyAccess() {
if (PackageManager.PERMISSION_GRANTED != getContext().checkCallingPermission(
Manifest.permission.ACCESS_FM_RADIO)) {
throw new SecurityException("ACCESS_FM_RADIO permission not granted");
Manifest.permission.ACCESS_BROADCAST_RADIO)) {
throw new SecurityException("ACCESS_BROADCAST_RADIO permission not granted");
}
}