Merge "Add support for restrictions on sensor toggles" into ub-testdpc-sc

Author: Rubin Xu

app/src/main/java/com/afwsamples/testdpc/policy/UserRestriction.java

@@ -10,6 +10,7 @@
 import static android.os.UserManager.DISALLOW_AUTOFILL;
 import static android.os.UserManager.DISALLOW_BLUETOOTH;
 import static android.os.UserManager.DISALLOW_BLUETOOTH_SHARING;
+import static android.os.UserManager.DISALLOW_CAMERA_TOGGLE;
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 import static android.os.UserManager.DISALLOW_CONFIG_BRIGHTNESS;
 import static android.os.UserManager.DISALLOW_CONFIG_CELL_BROADCASTS;
@@ -34,6 +35,7 @@
 import static android.os.UserManager.DISALLOW_INSTALL_APPS;
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
+import static android.os.UserManager.DISALLOW_MICROPHONE_TOGGLE;
 import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
 import static android.os.UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA;
 import static android.os.UserManager.DISALLOW_NETWORK_RESET;
@@ -56,6 +58,7 @@
 import static android.os.UserManager.DISALLOW_USER_SWITCH;
 import static android.os.UserManager.ENSURE_VERIFY_APPS;
 
+import android.os.UserManager;
 import com.afwsamples.testdpc.R;
 
 public class UserRestriction {
@@ -206,6 +209,10 @@ public UserRestriction(String key, int titleResId) {
             new UserRestriction(
                     DISALLOW_CONFIG_PRIVATE_DNS,
                     R.string.disallow_config_private_dns),
+            new UserRestriction(DISALLOW_MICROPHONE_TOGGLE,
+                    R.string.disallow_microphone_toggle),
+            new UserRestriction(DISALLOW_CAMERA_TOGGLE,
+                    R.string.disallow_camera_toggle),
     };
 
     /**
@@ -256,7 +263,7 @@ public UserRestriction(String key, int titleResId) {
             new UserRestriction(DISALLOW_OUTGOING_CALLS,
                     R.string.disallow_outgoing_calls),
             new UserRestriction(DISALLOW_UNMUTE_MICROPHONE,
-                    R.string.disallow_unmute_microphone),
+                    R.string.disallow_unmute_microphone)
     };
 
     /**
@@ -293,7 +300,9 @@ public UserRestriction(String key, int titleResId) {
      * User restrictions that cannot be set by profile owners. Applied to all users.
      */
     public static final String[] DEVICE_OWNER_ONLY_RESTRICTIONS = {
-            DISALLOW_USER_SWITCH
+            DISALLOW_USER_SWITCH,
+            DISALLOW_MICROPHONE_TOGGLE,
+            DISALLOW_CAMERA_TOGGLE,
     };
 
     /**

app/src/main/res/values/strings.xml

@@ -493,6 +493,8 @@
     <string name="disallow_uninstall_apps">Disallow uninstall apps</string>
     <string name="disallow_unmute_microphone">Disallow unmute microphone</string>
     <string name="disallow_usb_file_transfer">Disallow usb file transfer</string>
+    <string name="disallow_microphone_toggle">Disallow microphone toggle</string>
+    <string name="disallow_camera_toggle">Disallow camera toggle</string>
     <string name="ensure_verify_apps">Ensure verify apps</string>
     <string name="disallow_autofill">Disallow autofill</string>
     <string name="disallow_unified_password">Require separate challenge</string>