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

Commit 2a01ddbb authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Give platform permissions a dummy group 

We still don't want apps to deal with permissions groups but many apps
crash if the group is not set.

Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered
Change-Id: Ibc817d4d44a9a76a1c5fac170f8e76f96a9e4201
Fixes: 119836955
parent 122c0879

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ package android { 
    field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";

  }



  public static final class Manifest.permission_group {

    field public static final java.lang.String UNDEFINED = "android.permission-group.UNDEFINED";

  }



  public static final class R.array {

    field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005

  }

core/res/AndroidManifest.xml

+41 −0
Original line number Diff line number Diff line
@@ -627,6 +627,13 @@ 
    <!-- ====================================================================== -->

    <eat-comment />



    <!-- Grouping for platform runtime permissions is not accessible to apps

         @hide

         @SystemApi

    -->

    <permission-group android:name="android.permission-group.UNDEFINED"

        android:priority="100" />



    <!-- ====================================================================== -->

    <!-- Permissions for accessing user's contacts including personal profile   -->

    <!-- ====================================================================== -->
@@ -645,6 +652,7 @@ 
        <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.READ_CONTACTS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readContacts"

        android:description="@string/permdesc_readContacts"

        android:protectionLevel="dangerous" />
@@ -653,6 +661,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.WRITE_CONTACTS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_writeContacts"

        android:description="@string/permdesc_writeContacts"

        android:protectionLevel="dangerous" />
@@ -674,6 +683,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.READ_CALENDAR"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readCalendar"

        android:description="@string/permdesc_readCalendar"

        android:protectionLevel="dangerous" />
@@ -682,6 +692,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.WRITE_CALENDAR"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_writeCalendar"

        android:description="@string/permdesc_writeCalendar"

        android:protectionLevel="dangerous" />
@@ -703,6 +714,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.SEND_SMS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_sendSms"

        android:description="@string/permdesc_sendSms"

        android:permissionFlags="costsMoney"
@@ -712,6 +724,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.RECEIVE_SMS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_receiveSms"

        android:description="@string/permdesc_receiveSms"

        android:protectionLevel="dangerous"/>
@@ -720,6 +733,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.READ_SMS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readSms"

        android:description="@string/permdesc_readSms"

        android:protectionLevel="dangerous" />
@@ -728,6 +742,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.RECEIVE_WAP_PUSH"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_receiveWapPush"

        android:description="@string/permdesc_receiveWapPush"

        android:protectionLevel="dangerous" />
@@ -736,6 +751,7 @@ 
        <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.RECEIVE_MMS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_receiveMms"

        android:description="@string/permdesc_receiveMms"

        android:protectionLevel="dangerous" />
@@ -753,6 +769,7 @@ 
         <p>Protection level: dangerous

         @hide Pending API council approval -->

    <permission android:name="android.permission.READ_CELL_BROADCASTS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readCellBroadcasts"

        android:description="@string/permdesc_readCellBroadcasts"

        android:protectionLevel="dangerous" />
@@ -794,6 +811,7 @@ 
     @deprecated replaced by new strongly-typed permission groups in Q.

     -->

    <permission android:name="android.permission.READ_EXTERNAL_STORAGE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_sdcardRead"

        android:description="@string/permdesc_sdcardRead"

        android:protectionLevel="dangerous"
@@ -815,6 +833,7 @@ 
         @deprecated replaced by new strongly-typed permission groups in Q.

    -->

    <permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_sdcardWrite"

        android:description="@string/permdesc_sdcardWrite"

        android:protectionLevel="dangerous"
@@ -831,6 +850,7 @@ 


    <!-- Allows an application to read the user's shared audio collection. -->

    <permission android:name="android.permission.READ_MEDIA_AUDIO"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_audioRead"

        android:description="@string/permdesc_audioRead"

        android:protectionLevel="dangerous" />
@@ -846,12 +866,14 @@ 


    <!-- Allows an application to read the user's shared images collection. -->

    <permission android:name="android.permission.READ_MEDIA_IMAGES"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_imagesRead"

        android:description="@string/permdesc_imagesRead"

        android:protectionLevel="dangerous" />



    <!-- Allows an application to read the user's shared video collection. -->

    <permission android:name="android.permission.READ_MEDIA_VIDEO"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_videoRead"

        android:description="@string/permdesc_videoRead"

        android:protectionLevel="dangerous" />
@@ -859,6 +881,7 @@ 
    <!-- Allows an application to access any geographic locations persisted in the

         user's shared collection. -->

    <permission android:name="android.permission.ACCESS_MEDIA_LOCATION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_mediaLocation"

        android:description="@string/permdesc_mediaLocation"

        android:protectionLevel="dangerous" />
@@ -889,6 +912,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ACCESS_FINE_LOCATION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_accessFineLocation"

        android:description="@string/permdesc_accessFineLocation"

        android:backgroundPermission="android.permission.ACCESS_BACKGROUND_LOCATION"
@@ -899,6 +923,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ACCESS_COARSE_LOCATION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_accessCoarseLocation"

        android:description="@string/permdesc_accessCoarseLocation"

        android:backgroundPermission="android.permission.ACCESS_BACKGROUND_LOCATION"
@@ -911,6 +936,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_accessBackgroundLocation"

        android:description="@string/permdesc_accessBackgroundLocation"

        android:protectionLevel="dangerous|instant" />
@@ -951,6 +977,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.READ_CALL_LOG"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readCallLog"

        android:description="@string/permdesc_readCallLog"

        android:protectionLevel="dangerous" />
@@ -969,6 +996,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.WRITE_CALL_LOG"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_writeCallLog"

        android:description="@string/permdesc_writeCallLog"

        android:protectionLevel="dangerous" />
@@ -979,6 +1007,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.PROCESS_OUTGOING_CALLS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_processOutgoingCalls"

        android:description="@string/permdesc_processOutgoingCalls"

        android:protectionLevel="dangerous" />
@@ -1010,6 +1039,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.READ_PHONE_STATE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readPhoneState"

        android:description="@string/permdesc_readPhoneState"

        android:protectionLevel="dangerous" />
@@ -1018,6 +1048,7 @@ 
         granted by {@link #READ_PHONE_STATE} but is exposed to instant applications.

         <p>Protection level: dangerous-->

    <permission android:name="android.permission.READ_PHONE_NUMBERS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_readPhoneNumbers"

        android:description="@string/permdesc_readPhoneNumbers"

        android:protectionLevel="dangerous|instant" />
@@ -1027,6 +1058,7 @@ 
        <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.CALL_PHONE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:permissionFlags="costsMoney"

        android:label="@string/permlab_callPhone"

        android:description="@string/permdesc_callPhone"
@@ -1036,6 +1068,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_addVoicemail"

        android:description="@string/permdesc_addVoicemail"

        android:protectionLevel="dangerous" />
@@ -1044,6 +1077,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.USE_SIP"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:description="@string/permdesc_use_sip"

        android:label="@string/permlab_use_sip"

        android:protectionLevel="dangerous"/>
@@ -1052,6 +1086,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ANSWER_PHONE_CALLS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_answerPhoneCalls"

        android:description="@string/permdesc_answerPhoneCalls"

        android:protectionLevel="dangerous|runtime" />
@@ -1079,6 +1114,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ACCEPT_HANDOVER"

                android:permissionGroup="android.permission-group.UNDEFINED"

                android.label="@string/permlab_acceptHandover"

                android:description="@string/permdesc_acceptHandovers"

                android:protectionLevel="dangerous" />
@@ -1102,6 +1138,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.RECORD_AUDIO"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_recordAudio"

        android:description="@string/permdesc_recordAudio"

        android:protectionLevel="dangerous|instant"/>
@@ -1123,6 +1160,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.ACTIVITY_RECOGNITION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_activityRecognition"

        android:description="@string/permdesc_activityRecognition"

        android:protectionLevel="dangerous|instant" />
@@ -1171,6 +1209,7 @@ 
         <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.CAMERA"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_camera"

        android:description="@string/permdesc_camera"

        android:protectionLevel="dangerous|instant" />
@@ -1194,6 +1233,7 @@ 
         measure what is happening inside his/her body, such as heart rate.

         <p>Protection level: dangerous -->

    <permission android:name="android.permission.BODY_SENSORS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_bodySensors"

        android:description="@string/permdesc_bodySensors"

        android:protectionLevel="dangerous" />
@@ -1680,6 +1720,7 @@ 
    <p>Protection level: dangerous

    -->

    <permission android:name="android.permission.GET_ACCOUNTS"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:protectionLevel="dangerous"

        android:description="@string/permdesc_getAccounts"

        android:label="@string/permlab_getAccounts" />