Merge "Private DNS: Do not apply user restriction to system"

2019-02-09 21:01:27 +00:00
parent fc40551b9d c28f98a7e8
commit fd6eb8c2d8
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -743,6 +743,9 @@ public class UserRestrictionsUtils {

            case android.provider.Settings.Global.PRIVATE_DNS_MODE:
            case android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER:
+                if (callingUid == Process.SYSTEM_UID) {
+                    return false;
+                }
                restriction = UserManager.DISALLOW_CONFIG_PRIVATE_DNS;
                break;
            default: