summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-09-28 22:16:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-09-28 22:16:45 +0000
commite72c731070d636fbecc0ca1f915ddd3854a7b278 (patch)
tree056e907f2babfd2a3442dcc92249fb5c3225060e
parent493cb6d5cb30f453b5a4db5bac45a813f64c6a97 (diff)
parente5bf4b368208fac2295bce33c85ea8e5b02a8611 (diff)
Merge "Expose background location permission"
-rwxr-xr-xapi/current.txt1
-rw-r--r--core/res/AndroidManifest.xml1
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 87aaaa671da3..8db72b951502 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -7,6 +7,7 @@ package android {
public static final class Manifest.permission {
ctor public Manifest.permission();
field public static final java.lang.String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
+ field public static final java.lang.String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION";
field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
field public static final java.lang.String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
field public static final java.lang.String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 85a52d5f714f..9acb08b25db2 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -941,7 +941,6 @@
Requesting this by itself is not sufficient to give you
location access.
<p>Protection level: dangerous
- @hide
-->
<permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
android:permissionGroup="android.permission-group.LOCATION"