am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev

* commit '8ddbb2cf63f52af38a61faed5f58b89e2dc84aef':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
This commit is contained in:
Christofer Åkersten
2014-08-27 03:12:06 +00:00
committed by Android Git Automerger

View File

@@ -2208,7 +2208,7 @@
<permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS"
android:label="@string/permlab_modifyParentalControls"
android:description="@string/permdesc_modifyParentalControls"
android:protectionLevel="signature" />
android:protectionLevel="signature|system" />
<!-- Must be required by device administration receiver, to ensure that only the
system can interact with it. -->