From 4c87024b7b3dba46e095674e45fb7f997c531eff Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 9 Jan 2019 16:45:45 -0500
Subject: [PATCH] Update documentation on notification policy access

DND access cannot be given to managed profiles

Test: manual
Change-Id: I0751bbbfc69e1d80e4376e4c7aa0b4ffd5e8c8ab
Fixes: 80228966
---
 core/java/android/provider/Settings.java | 3 ++-
 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 66e1c80fa31e6..b59eae30bf3c7 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 449a7b3305ad5..406141b092983 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"