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

Commit b1d9bc40 authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Add normal permission to access hidden profiles" into main

parents 0170ea2d 0d19b706

core/api/current.txt

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

    field public static final String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";

    field public static final String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";

    field @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") public static final String ACCESS_HIDDEN_PROFILES = "android.permission.ACCESS_HIDDEN_PROFILES";

    field public static final String ACCESS_LOCATION_EXTRA_COMMANDS = "android.permission.ACCESS_LOCATION_EXTRA_COMMANDS";

    field public static final String ACCESS_MEDIA_LOCATION = "android.permission.ACCESS_MEDIA_LOCATION";

    field public static final String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";

core/java/android/content/pm/multiuser.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -108,3 +108,10 @@ flag { 
    bug: "316362775"

    is_fixed_read_only: true

}



flag {

    name: "enable_permission_to_access_hidden_profiles"

    namespace: "profile_experiences"

    description: "Add permission to access API hidden users data via system APIs"

    bug: "321988638"

}

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -3188,6 +3188,14 @@ 
    <permission android:name="android.permission.INTERACT_ACROSS_PROFILES"

        android:protectionLevel="signature|appop" />



    <!-- Allows applications to access profiles with ACCESS_HIDDEN_PROFILES user property

     <p>Protection level: normal

     @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") -->

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

        android:label="@string/permlab_accessHiddenProfile"

        android:description="@string/permdesc_accessHiddenProfile"

        android:protectionLevel="normal" />



    <!-- @SystemApi @hide Allows starting activities across profiles in the same profile group. -->

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

                android:protectionLevel="signature|role" />

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,11 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_setWallpaper">Allows the app to set the system wallpaper.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_accessHiddenProfile">Access hidden profiles</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_accessHiddenProfile">Allows the app to access hidden profiles.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_setWallpaperHints">adjust your wallpaper size</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->