Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 033fea5b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add assist content admin control" into aosp-main-future am: e3db116c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27736995



Change-Id: I8a551b111e91c75549ad5175cb37b28aa7d341b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2c155a3 e3db116c

services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ final class PolicyDefinition<V> { 
            USER_RESTRICTION_FLAGS.put(

                    UserManager.DISALLOW_THREAD_NETWORK, POLICY_FLAG_GLOBAL_ONLY_POLICY);

        }



        USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_ASSIST_CONTENT, /* flags= */ 0);

        for (String key : USER_RESTRICTION_FLAGS.keySet()) {

            createAndAddUserRestrictionPolicyDefinition(key, USER_RESTRICTION_FLAGS.get(key));

        }