commit c1205111a92b52283078f1a2e86c8d32c5928b92
author Tony Mak <tonymak@google.com> Fri Jul 22 16:02:59 2016 +0100
committer Tony Mak <tonymak@google.com> Fri Jul 22 17:12:54 2016 +0000
tree de032c50e9d4f890967fcf2e2ecb6d3e41c300f2
parent 9fd8d75ebc71caf09970746cadaa26868072b637

Persist master volume mute across reboot

Fix: 30133263

Change-Id: I53450a504e40e55516acc88550f369a74a244eaf

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index 0499757..ae6276b 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -105,7 +105,8 @@
             UserManager.DISALLOW_DATA_ROAMING,
             UserManager.DISALLOW_SET_USER_ICON,
             UserManager.DISALLOW_SET_WALLPAPER,
-            UserManager.DISALLOW_OEM_UNLOCK
+            UserManager.DISALLOW_OEM_UNLOCK,
+            UserManager.DISALLLOW_UNMUTE_DEVICE,
     });
 
     /**
@@ -150,7 +151,8 @@
     private static final Set<String> GLOBAL_RESTRICTIONS = Sets.newArraySet(
             UserManager.DISALLOW_ADJUST_VOLUME,
             UserManager.DISALLOW_RUN_IN_BACKGROUND,
-            UserManager.DISALLOW_UNMUTE_MICROPHONE
+            UserManager.DISALLOW_UNMUTE_MICROPHONE,
+            UserManager.DISALLLOW_UNMUTE_DEVICE
     );
 
     /**
@@ -436,6 +438,7 @@
                             manager.setOemUnlockEnabled(false);
                         }
                     }
+                    break;
             }
         } finally {
             Binder.restoreCallingIdentity(id);