Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68a0dafc authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

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

parents 64aa52c1 df77643c

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -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";

























core/res/AndroidManifest.xml



+6
−1




























Original line number
Diff line number
Diff line








@@ -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" />

































core/tests/BroadcastRadioTests/AndroidManifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -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" />

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -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);

































data/etc/platform.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -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>