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

Commit 4945d1ac authored by Jared Finder's avatar Jared Finder Committed by Android (Google) Code Review
Browse files

Merge "Put fine eye tracking into a new permission group" into main

parents a3d673a8 55ab7e9a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ package android { 
    field public static final String SENSORS = "android.permission-group.SENSORS";

    field public static final String SMS = "android.permission-group.SMS";

    field public static final String STORAGE = "android.permission-group.STORAGE";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String XR_EYE_SENSITIVE = "android.permission-group.XR_EYE_SENSITIVE";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String XR_TRACKING = "android.permission-group.XR_TRACKING";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String XR_TRACKING_SENSITIVE = "android.permission-group.XR_TRACKING_SENSITIVE";

  }

core/res/AndroidManifest.xml

+14 −4
Original line number Diff line number Diff line
@@ -5351,12 +5351,12 @@ 
                android:featureFlag="android.xr.xr_manifest_entries" />



    <!-- Used for permissions that are associated with accessing

         particularly sensitive XR tracking data.

         sensitive XR eye tracking data.



         @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) -->

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

                      android:label="@string/permgrouplab_xr_tracking_sensitive"

                      android:description="@string/permgroupdesc_xr_tracking_sensitive"

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

                      android:label="@string/permgrouplab_xr_eye_sensitive"

                      android:description="@string/permgroupdesc_xr_eye_sensitive"

                      android:priority="100"

                      android:featureFlag="android.xr.xr_manifest_entries" />
@@ -5372,6 +5372,16 @@ 
                android:description="@string/permdesc_eye_tracking_fine"

                android:featureFlag="android.xr.xr_manifest_entries" />



    <!-- Used for permissions that are associated with accessing

         sensitive XR tracking data.



         @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) -->

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

                      android:label="@string/permgrouplab_xr_tracking_sensitive"

                      android:description="@string/permgroupdesc_xr_tracking_sensitive"

                      android:priority="100"

                      android:featureFlag="android.xr.xr_manifest_entries" />



    <!-- Allows an application to get head tracking data.  Unmanaged

         activities (OpenXR activities with the manifest property

         "android.window.PROPERTY_XR_ACTIVITY_START_MODE" set to

core/res/res/values/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -1014,15 +1014,20 @@ 
    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->

    <string name="permgroupdesc_notifications">show notifications</string>













    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]-->













    <string name="permgrouplab_xr_eye_sensitive">XR sensitive eye tracking data</string>













    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->













    <string name="permgroupdesc_xr_eye_sensitive">access sensitive eye gaze data</string>



























    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]-->















    <string name="permgrouplab_xr_tracking">XR tracking data</string>















    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->















    <string name="permgroupdesc_xr_tracking">access XR data about you and the environment around you</string>





























    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]-->













    <string name="permgrouplab_xr_tracking_sensitive">sensitive XR tracking data</string>













    <string name="permgrouplab_xr_tracking_sensitive">Sensitive XR tracking data</string>















    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->













    <string name="permgroupdesc_xr_tracking_sensitive">access sensitive tracking data, such as eye gaze</string>













    <string name="permgroupdesc_xr_tracking_sensitive">access sensitive tracking data about you and the environment around you</string>





























    <!-- Title for the capability of an accessibility service to retrieve window content. -->















    <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>