commit c7839f04c840d0fa6c6ee01c964e7a243615b9fb
author Roshan Pius <rpius@google.com> Mon Mar 22 10:08:25 2021 -0700
committer Roshan Pius <rpius@google.com> Mon Mar 22 15:49:45 2021 -0700
tree c65d0eb51e9d6977d621320f10ee520c0149f506
parent 95af04b58b13284a07f5d9cb23b164cfc7ac258a

WifiInfo: Redact MAC address if caller does not have location permission

Bug: 181981086
Test: atest android.net.wifi
Change-Id: Ib334e521f87a289493b6e57c71311d26486df3fb

framework/api/current.txt

diff --git a/framework/api/current.txt b/framework/api/current.txt
index cb2de2d..cce1677 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -297,7 +297,7 @@
     method @Nullable public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
     method @Deprecated public int getIpAddress();
     method public int getLinkSpeed();
-    method @RequiresPermission(android.Manifest.permission.LOCAL_MAC_ADDRESS) public String getMacAddress();
+    method @RequiresPermission(allOf={android.Manifest.permission.LOCAL_MAC_ADDRESS, android.Manifest.permission.ACCESS_FINE_LOCATION}) public String getMacAddress();
     method public int getMaxSupportedRxLinkSpeedMbps();
     method public int getMaxSupportedTxLinkSpeedMbps();
     method public int getNetworkId();