summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-04-05 02:20:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-05 02:20:25 +0000
commit044eeecc1da059c7311c6444df4d6bba176cd2d5 (patch)
tree0d6fe2b2f3827285bd4e0f9cd139871048bd28ee
parent045c71f1be06b89614102420b47d9184055cd190 (diff)
parent9105beacb34e63725ff94336c0fd9030a2985857 (diff)
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0a50048c5149..a73f54354062 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -528,6 +528,7 @@
<protected-broadcast android:name="com.android.internal.autofill.action.REQUEST_AUTOFILL" />
<protected-broadcast android:name="android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED" />
<protected-broadcast android:name="com.android.server.wm.ACTION_REVOKE_SYSTEM_ALERT_WINDOW_PERMISSION" />
+ <protected-broadcast android:name="android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED" />
<protected-broadcast android:name="android.content.pm.action.SESSION_COMMITTED" />
<protected-broadcast android:name="android.os.action.USER_RESTRICTIONS_CHANGED" />