| commit | 193c760b4b72487153886d1fe2810a32166ce55f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Aug 14 06:30:57 2021 +0000 |
| committer | Xin Li <delphij@google.com> | Sat Aug 14 06:30:57 2021 +0000 |
| tree | 5a5a7697a4be8151f68c69a7c4c4ebc5d91897ff | |
| parent | b41a26429f40b2da75da6fcb0c1764880c51c08d [diff] | |
| parent | ddc9f85146b5b8a8b56d01764e71c08ee517e94d [diff] |
Merge sc-dev-plus-aosp-without-vendor@7634622 Merged-In: I8aeb10d7b3fc201e95259ea658efd45357fa5338 Change-Id: I20324e8e87e3b6a942317b79f74d6919f7ead230
diff --git a/OWNERS b/OWNERS index 0a92ab5..9577ad2 100644 --- a/OWNERS +++ b/OWNERS
@@ -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 @@ 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); }