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

Commit c374ee63 authored by Zhennan Xu's avatar Zhennan Xu Committed by Android (Google) Code Review
Browse files

Merge "Add role protection to READ_BLOCKED_NUMBERS." into main

parents 36a4c5f8 b6f3107a

core/java/android/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -514,3 +514,12 @@ flag { 
    description: "Force AttributionSource.myAttributionSource() to return a default device id"

    bug: "343121936"

}



flag {

    name: "grant_read_blocked_numbers_to_system_ui_intelligence"

    is_exported: true

    is_fixed_read_only: true

    namespace: "permissions"

    description: "This flag is used to add role protection to READ_BLOCKED_NUMBERS for SYSTEM_UI_INTELLIGENCE"

    bug: "354758615"

}

core/res/AndroidManifest.xml

+11 −1
Original line number Diff line number Diff line
@@ -7759,7 +7759,17 @@ 
         @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies")

         @hide -->

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

                android:protectionLevel="signature" />

                android:protectionLevel="signature"

                android:featureFlag="!android.permission.flags.grant_read_blocked_numbers_to_system_ui_intelligence" />



    <!-- Allows the holder to read blocked numbers. See

         {@link android.provider.BlockedNumberContract}.

         @SystemApi

         @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies")

         @hide -->

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

                android:protectionLevel="signature|role"

                android:featureFlag="android.permission.flags.grant_read_blocked_numbers_to_system_ui_intelligence" />



    <!-- Allows the holder to write blocked numbers. See

         {@link android.provider.BlockedNumberContract}.