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

Commit 16fada24 authored by Ge Huang's avatar Ge Huang Committed by Android (Google) Code Review
Browse files

Merge "New runtime permission ACCESS_LOCAL_NETWORK" into main

parents 5e26e4b6 23848435

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ java_aconfig_library { 
        "com.android.extservices",

        "com.android.nfcservices",

        "com.android.permission",

        "com.android.tethering",

    ],

}

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ package android { 
    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 @FlaggedApi("android.provider.launcher_data_access") public static final String ACCESS_LAUNCHER_DATA = "android.permission.ACCESS_LAUNCHER_DATA";

    field @FlaggedApi("android.permission.flags.access_local_network_permission_enabled") public static final String ACCESS_LOCAL_NETWORK = "android.permission.ACCESS_LOCAL_NETWORK";

    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/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -622,3 +622,12 @@ flag { 
    bug: "399850691"

    is_fixed_read_only: true

}



flag {

    name: "access_local_network_permission_enabled"

    is_exported: true

    is_fixed_read_only: true

    namespace: "android_core_networking"

    description: "This flag is used to enable the new ACCESS_LOCAL_NETWORK runtime permission. When enabled, this permission will be used for local network protection, replacing NEARBY_WIFI_DEVICES for this purpose."

    bug: "388774939"

}

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -2529,6 +2529,16 @@ 
                android:label="@string/permlab_nearby_wifi_devices"

                android:protectionLevel="dangerous" />













    <!-- Required to be able to advertise and connect to local network devices.













         @FlaggedApi(android.permission.flags.Flags.FLAG_ACCESS_LOCAL_NETWORK_PERMISSION_ENABLED)













         <p>Protection level: dangerous -->













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













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













        android:description="@string/permdesc_access_local_network"













        android:label="@string/permlab_access_local_network"













        android:protectionLevel="dangerous"













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



























    <!-- Required to be able to range to devices using generic ranging module.















         @FlaggedApi("android.permission.flags.ranging_permission_enabled")















         <p>Protection level: dangerous -->

































core/res/res/values/strings.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -1875,6 +1875,11 @@













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















    <string name="permdesc_nearby_wifi_devices">Allows the app to advertise, connect, and determine the relative position of nearby Wi\u2011Fi devices</string>



























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













    <string name="permlab_access_local_network">access local network devices</string>













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













    <string name="permdesc_access_local_network">Allows the app to access local network devices</string>



























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















    <string name="permlab_ranging">determine relative position between nearby devices</string>















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