diff options
author | Xin Li <delphij@google.com> | 2021-10-06 22:53:58 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:58 +0000 |
commit | 027d657a4012f6f5dad581c5f7e5647bd5e5393a (patch) | |
tree | 5a5a7697a4be8151f68c69a7c4c4ebc5d91897ff | |
parent | b41a26429f40b2da75da6fcb0c1764880c51c08d (diff) | |
parent | 193c760b4b72487153886d1fe2810a32166ce55f (diff) | |
download | SampleLocationAttribution-android-s-v2-preview-2.tar.gz |
Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Bug: 202323961
Merged-In: I20324e8e87e3b6a942317b79f74d6919f7ead230
Change-Id: Ib0f961137401358ca3bb2fdf35c178500d0fc2ca
-rw-r--r-- | OWNERS | 1 | ||||
-rw-r--r-- | src/com/example/android/locationattribution/MainActivity.java | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,3 @@ -aadmal@google.com gomo@google.com wyattriley@google.com yuhany@google.com diff --git a/src/com/example/android/locationattribution/MainActivity.java b/src/com/example/android/locationattribution/MainActivity.java index 3f72bfc..83bcdc1 100644 --- a/src/com/example/android/locationattribution/MainActivity.java +++ b/src/com/example/android/locationattribution/MainActivity.java @@ -133,8 +133,7 @@ public class MainActivity extends AppCompatActivity { private void showRequestLocationPermissionDialog() { ActivityCompat.requestPermissions(this, - new String[]{Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_BACKGROUND_LOCATION}, + new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, NON_FRAMEWORK_LOCATION_PERMISSION); } |