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

Commit 12f70534 authored by Etan Cohen's avatar Etan Cohen
Browse files

[WIFI][LOCATION] Convert API from Coarse -> Fine for >= Q 

Convert all Wi-Fi permissions from Coarse -> Fine for:
- Wi-Fi Direct (p2p) always (since new permissions for Q)
- Else (Wi-Fi, Aware): target SDK >= Q

Bug: 122374563
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Ia1d892d303ec9f002692f30d9e9fc043729b68d8
parent 3b943e77

api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -29752,7 +29752,7 @@ package android.net.wifi { 
    method @Deprecated public boolean disableNetwork(int);

    method @Deprecated public boolean disconnect();

    method @Deprecated public boolean enableNetwork(int, boolean);

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();

    method public android.net.wifi.WifiInfo getConnectionInfo();

    method public android.net.DhcpInfo getDhcpInfo();

    method public int getMaxNumberOfNetworkSuggestionsPerApp();
@@ -30243,26 +30243,26 @@ package android.net.wifi.p2p { 
  }















  public class WifiP2pManager {













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void addServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public android.net.wifi.p2p.WifiP2pManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.p2p.WifiP2pManager.ChannelListener);















    method public void removeGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);















    method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);















    method public void requestDiscoveryState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);















    method public void requestNetworkInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener);















    method public void requestP2pState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.P2pStateListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);















    method public void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener);















    method public void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener);















    method public void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener);

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4503,7 +4503,7 @@ package android.net.wifi {













    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);















    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(java.util.List<android.net.wifi.ScanResult>);















    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);













    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();













    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();















    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();















    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();















    method public boolean isDeviceToDeviceRttSupported();

































wifi/java/android/net/wifi/WifiManager.java



+7
−10




























Original line number
Diff line number
Diff line








@@ -16,7 +16,7 @@





























package android.net.wifi;





























import static android.Manifest.permission.ACCESS_COARSE_LOCATION;













import static android.Manifest.permission.ACCESS_FINE_LOCATION;















import static android.Manifest.permission.ACCESS_WIFI_STATE;















import static android.Manifest.permission.READ_WIFI_CREDENTIAL;


























@@ -950,8 +950,7 @@ public class WifiManager {













     * which was created with {@link WifiNetworkConfigBuilder#setIsAppInteractionRequired()} flag















     * set.















     * <p>













     * Note: The broadcast is sent to the app only if it holds either one of













     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or













     * Note: The broadcast is sent to the app only if it holds















     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission.















     *















     * @see #EXTRA_NETWORK_SUGGESTION










@@ -1183,7 +1182,7 @@ public class WifiManager {













     * containing configurations which they created.















     */















    @Deprecated













    @RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_WIFI_STATE})













    @RequiresPermission(allOf = {ACCESS_FINE_LOCATION, ACCESS_WIFI_STATE})















    public List<WifiConfiguration> getConfiguredNetworks() {















        try {















            ParceledListSlice<WifiConfiguration> parceledList =









@@ -1199,7 +1198,7 @@ public class WifiManager {





























    /** @hide */















    @SystemApi













    @RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_WIFI_STATE, READ_WIFI_CREDENTIAL})













    @RequiresPermission(allOf = {ACCESS_FINE_LOCATION, ACCESS_WIFI_STATE, READ_WIFI_CREDENTIAL})















    public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {















        try {















            ParceledListSlice<WifiConfiguration> parceledList =










@@ -1656,8 +1655,7 @@ public class WifiManager {













     * When the device decides to connect to one of the provided network suggestions, platform sends















     * a directed broadcast {@link #ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION} to the app if















     * the network was created with {@link WifiNetworkConfigBuilder#setIsAppInteractionRequired()}













     * flag set and the app holds either one of













     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or













     * flag set and the app holds















     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission.















     *<p>















     * NOTE:










@@ -2288,7 +2286,6 @@ public class WifiManager {













    /**















     * Return the results of the latest access point scan.















     * @return the list of access points found in the most recent scan. An app must hold













     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or















     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission















     * in order to get valid results.















     */










@@ -2599,7 +2596,7 @@ public class WifiManager {













     * <p>















     * Applications need to have the following permissions to start LocalOnlyHotspot: {@link















     * android.Manifest.permission#CHANGE_WIFI_STATE} and {@link













     * android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION}.  Callers without













     * android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION}.  Callers without















     * the permissions will trigger a {@link java.lang.SecurityException}.















     * <p>















     * @param callback LocalOnlyHotspotCallback for the application to receive updates about










@@ -2682,7 +2679,7 @@ public class WifiManager {













     * {@link LocalOnlyHotspotObserver#onStopped()} callbacks.















     * <p>















     * Applications should have the













     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION}













     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION}















     * permission.  Callers without the permission will trigger a















     * {@link java.lang.SecurityException}.















     * <p>

































wifi/java/android/net/wifi/aware/IdentityChangedListener.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -30,7 +30,7 @@ package android.net.wifi.aware;













public class IdentityChangedListener {















    /**















     * @param mac The MAC address of the Aware discovery interface. The application must have the













     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} to get the actual MAC address,













     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} to get the actual MAC address,















     *            otherwise all 0's will be provided.















     */















    public void onIdentityChanged(byte[] mac) {

































wifi/java/android/net/wifi/aware/WifiAwareManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -231,7 +231,7 @@ public class WifiAwareManager {













     * <p>















     * This version of the API attaches a listener to receive the MAC address of the Aware interface















     * on startup and whenever it is updated (it is randomized at regular intervals for privacy).













     * The application must have the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}













     * The application must have the {@link android.Manifest.permission#ACCESS_FINE_LOCATION}















     * permission to execute this attach request. Otherwise, use the















     * {@link #attach(AttachCallback, Handler)} version. Note that aside from permission















     * requirements this listener will wake up the host at regular intervals causing higher power