summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-10 23:43:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-10 23:43:34 +0000
commit7e3b1a95ecebb2c30e31958844b29584179a6d02 (patch)
treeb295cb1422fdc18829e5f6f5db843500b4635a1a
parent8151145dbbdcd774a88d68e098c8adda4f2bf426 (diff)
parent41c0b69c1ed06f4bf911ed9385efaa969ee76a43 (diff)
Merge "Expose permission READ_PRECISE_PHONE_STATE as public API" am: 8f5a92df20 am: ef35bbd484 am: 41c0b69c1e
Change-Id: Ie01d1924e937967b43c87625e179e1d4f0bfaf0a
-rw-r--r--api/current.txt1
-rw-r--r--core/res/AndroidManifest.xml4
2 files changed, 4 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index df7301ff09b8..42318fec419f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -115,6 +115,7 @@ package android {
field public static final String READ_LOGS = "android.permission.READ_LOGS";
field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS";
field public static final String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
+ field public static final String READ_PRECISE_PHONE_STATE = "android.permission.READ_PRECISE_PHONE_STATE";
field public static final String READ_SMS = "android.permission.READ_SMS";
field public static final String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
field public static final String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index d887032dbdbc..c050146c0e1a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2071,8 +2071,10 @@
android:protectionLevel="signature|privileged" />
<!-- Allows read only access to precise phone state.
- @hide Pending API council approval -->
+ Allows reading of detailed information about phone state for special-use applications
+ such as dialers, carrier applications, or ims applications. -->
<permission android:name="android.permission.READ_PRECISE_PHONE_STATE"
+ android:permissionGroup="android.permission-group.UNDEFINED"
android:protectionLevel="signature|privileged" />
<!-- @SystemApi Allows read access to privileged phone state.