commit 44960f9bf0684a3e236cdbff02bf70b315f2bdb2
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 12 21:59:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 12 21:59:00 2021 +0000
tree af4c998c6c26e87722aa94118d3e71ce7242268d
parent a10cc08f844d145147fb3c65b7f74979a4d8eff7
parent f87d7e5fc870549bf8430698267b122769963875

Merge "Fixed SecurityException due to Fine Location permission denied." into oc-mr1-dev am: b3aa4ab390 am: 1e0585624d am: 1c2f093d95 am: f87d7e5fc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13555580

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95a6b2d4f117fe871c5847ef2baabe082ed2d641

apps/hotspot/AndroidManifest.xml

diff --git a/apps/hotspot/AndroidManifest.xml b/apps/hotspot/AndroidManifest.xml
index 277be5f..fd8b045 100644
--- a/apps/hotspot/AndroidManifest.xml
+++ b/apps/hotspot/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <application>
         <activity android:name=".MainActivity">
             <intent-filter>

apps/hotspot/src/com/android/cts/hotspot/MainActivity.java

diff --git a/apps/hotspot/src/com/android/cts/hotspot/MainActivity.java b/apps/hotspot/src/com/android/cts/hotspot/MainActivity.java
index 2e0ed87..eb81563 100644
--- a/apps/hotspot/src/com/android/cts/hotspot/MainActivity.java
+++ b/apps/hotspot/src/com/android/cts/hotspot/MainActivity.java
@@ -16,5 +16,11 @@
             ActivityCompat.requestPermissions(
                     this, new String[] {Manifest.permission.ACCESS_COARSE_LOCATION}, 2);
         }
+
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(
+                    this, new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, 2);
+        }
     }
 }