commit 9d509c0b31667b3a73a64cc29e8a128f16daad46
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 09 12:28:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 09 12:28:48 2021 +0000
tree 517d4a001b135a6082e65ac05773624c1eb2acf8
parent 24f87e15e2a626040d208c0258c99be4e767b176
parent b9b493d39d609e14b8dda3bd863430fc393e4f14

Merge changes from topic "add_permission_wifidialog" into rvc-dev

* changes:
  [DO NOT MERGE] Add SafetyNet logging
  [DO NOT MERGE] Add permission checking to WifiDialogActivity

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f53cc1..f7ca87c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2708,6 +2708,10 @@
             </intent-filter>
         </activity>
 
+        <!--
+            The Wi-Fi result data will only be returned from WifiDialogActivity if the calling
+            package has ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission. (see b/185126813)
+        -->
         <activity
             android:name=".wifi.WifiDialogActivity"
             android:label=""