diff options
| author | 2019-01-14 14:35:47 +0000 | |
|---|---|---|
| committer | 2019-01-14 14:35:47 +0000 | |
| commit | efad1da2f1559decf1d8ed41d353dfa338af0a92 (patch) | |
| tree | 404e526d894a677096c13407d8fd3740929be203 | |
| parent | cf334204525b274fd8f12aee5c3bef618c11c69e (diff) | |
| parent | 4c87024b7b3dba46e095674e45fb7f997c531eff (diff) | |
Merge "Update documentation on notification policy access"
| -rw-r--r-- | core/java/android/provider/Settings.java | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee6e1ba78bc4..ef117eaaecc6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1190,7 +1190,8 @@ public final class Settings { /** * Activity Action: Show Do Not Disturb access settings. * <p> - * Users can grant and deny access to Do Not Disturb configuration from here. + * Users can grant and deny access to Do Not Disturb configuration from here. Managed + * profiles cannot grant Do Not Disturb access. * See {@link android.app.NotificationManager#isNotificationPolicyAccessGranted()} for more * details. * <p> diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index de8d50adc7d1..8147b4a2a009 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3906,7 +3906,8 @@ <permission android:name="android.permission.ACCESS_NOTIFICATIONS" android:protectionLevel="signature|privileged|appop" /> - <!-- Marker permission for applications that wish to access notification policy. + <!-- Marker permission for applications that wish to access notification policy. This permission + is not supported on managed profiles. <p>Protection level: normal --> <permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" |