commit c738a389d4f52b421556d5bc3c88cdfb4624a77c
author Mahaver Chopra <mahaver@google.com> Fri Feb 05 15:46:37 2016 +0000
committer Mahaver Chopra <mahaver@google.com> Thu Feb 11 20:15:57 2016 +0000
tree 7f160aa2a5da7ebd8c8a757c64b4732410117619
parent 931f814e190137233054a9a56e89ad6851a64b6a

Updated RestrictedSwitchPreference

Updated RestrictedSwitchPreference with new policy transparency changes.

Bug: 26763080
Change-Id: I187e38b157cc800626e1fbaffc9a2962a21be3c3

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3cc535a..dddbb32 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -131,6 +131,12 @@
     <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
     <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
 
+    <!-- Needed for passing extras with intent ACTION_SHOW_ADMIN_SUPPORT_DETAILS -->
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
+
+    <!-- Needed for calling DPM.getUserRestrictions() -->
+    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
+
     <!-- This tells the activity manager to not delay any of our activity
          start requests, even if they happen immediately after the user
          presses home. -->