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

Commit b0c84bce authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[ToA] Remove the appop protection because we focus on system leve in... 

Merge "[ToA] Remove the appop protection because we focus on system leve in current stage" into main
parents d6bdc801 b6807f05

core/java/android/app/AppOpsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,8 @@ public class AppOpsManager { 
                .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),

        new AppOpInfo.Builder(OP_READ_SYSTEM_GRAMMATICAL_GENDER,

                OPSTR_READ_SYSTEM_GRAMMATICAL_GENDER, "READ_SYSTEM_GRAMMATICAL_GENDER")

                .setPermission(Manifest.permission.READ_SYSTEM_GRAMMATICAL_GENDER)

                // will make it an app-op permission in the future.

                // .setPermission(Manifest.permission.READ_SYSTEM_GRAMMATICAL_GENDER)

                .build(),

    };

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -7961,11 +7961,11 @@ 


    <!-- @SystemApi Allows an application to read the system grammatical gender.

         @FlaggedApi("android.app.system_terms_of_address_enabled")

         <p>Protection level: signature|privileged|appop

         <p>Protection level: signature|privileged

         @hide

    -->

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

                android:protectionLevel="signature|privileged|appop"/>

                android:protectionLevel="signature|privileged"/>



    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>