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

Commit a5bd79b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "radio_scan_system_api" 

* changes:
  Promote RADIO_SCAN_WITHOUT_LOCATION permission to @SystemApi
  Process: Make WIFI_UID a public API constant
parents 101f60b7 39624ff3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35831,6 +35831,7 @@ package android.os { 
    field public static final int THREAD_PRIORITY_URGENT_AUDIO = -19; // 0xffffffed

    field public static final int THREAD_PRIORITY_URGENT_DISPLAY = -8; // 0xfffffff8

    field public static final int THREAD_PRIORITY_VIDEO = -10; // 0xfffffff6

    field public static final int WIFI_UID = 1010; // 0x3f2

  }















  public abstract class ProxyFileDescriptorCallback {

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -152,6 +152,7 @@ package android {













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















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















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













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















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















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















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

































core/java/android/os/Process.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -68,10 +68,9 @@ public class Process {













    public static final int LOG_UID = 1007;































    /**













     * Defines the UID/GID for the WIFI supplicant process.













     * @hide













     * Defines the UID/GID for the WIFI native processes like wificond, supplicant, hostapd,













     * vendor HAL, etc.















     */













    @UnsupportedAppUsage















    public static final int WIFI_UID = 1010;































    /**

































core/res/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -1654,6 +1654,7 @@













    <!-- Allows holder to request bluetooth/wifi scan bypassing global "use location" setting and















         location permissions.















         <p>Not for use by third-party or privileged applications.













         @SystemApi















         @hide















    -->















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