commit | 3bd14d2433139842cdf111fe4de7c8c79e9a35cb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jul 06 07:34:29 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 06 07:34:29 2021 +0000 |
tree | 80d7aeb192fabd6fad6ce405d925c5b2f8f88722 | |
parent | bf6af8ac9265833b69f6006735546e1d6005b69d [diff] | |
parent | 56a88885ccc383269f02a49fff6bb503ed35c9d8 [diff] |
Merge "Add comment to AndroidManifest" into sc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4d169c5..cf43731 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -2966,6 +2966,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=""